disable CONFIG_BOOTP_PREFER_SERVERIP

takumin · Sep 26, 2022 · 6db45e1 · 6db45e1
1 parent 14c0d65
commit 6db45e1
Show file tree

Hide file tree

Showing 17 changed files with 0 additions and 22 deletions.
diff --git a/configs/bcm2708_rpi_b_defconfig b/configs/bcm2708_rpi_b_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2708_rpi_b_plus_defconfig b/configs/bcm2708_rpi_b_plus_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2708_rpi_b_rev1_defconfig b/configs/bcm2708_rpi_b_rev1_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2708_rpi_cm_defconfig b/configs/bcm2708_rpi_cm_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2708_rpi_zero_defconfig b/configs/bcm2708_rpi_zero_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2708_rpi_zero_w_defconfig b/configs/bcm2708_rpi_zero_w_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2709_rpi_2_b_defconfig b/configs/bcm2709_rpi_2_b_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_2_b_defconfig b/configs/bcm2710_rpi_2_b_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_3_b_defconfig b/configs/bcm2710_rpi_3_b_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_3_b_plus_defconfig b/configs/bcm2710_rpi_3_b_plus_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_cm3_defconfig b/configs/bcm2710_rpi_cm3_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_zero_2_defconfig b/configs/bcm2710_rpi_zero_2_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2710_rpi_zero_2_w_defconfig b/configs/bcm2710_rpi_zero_2_w_defconfig
@@ -56,7 +56,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2711_rpi_400_defconfig b/configs/bcm2711_rpi_400_defconfig
@@ -71,7 +71,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2711_rpi_4_b_defconfig b/configs/bcm2711_rpi_4_b_defconfig
@@ -71,7 +71,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/configs/bcm2711_rpi_cm4_defconfig b/configs/bcm2711_rpi_cm4_defconfig
@@ -71,7 +71,6 @@ CONFIG_CMD_DNS=y
 CONFIG_CMD_SNTP=y
 CONFIG_CMD_LINK_LOCAL=y
 CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_BOOTP_PREFER_SERVERIP=y
 CONFIG_BOOTP_DNS2=y
 CONFIG_BOOTP_NISDOMAIN=y
 CONFIG_BOOTP_NTPSERVER=y

diff --git a/scripts/generate-defconfig.sh b/scripts/generate-defconfig.sh
@@ -95,12 +95,6 @@ for defconfig in "${CONFIG_DIR}"/*; do
     echo 'CONFIG_BOOTP_SEND_HOSTNAME=y' >> "${defconfig}"
   fi
 
-  if grep -Eqs "CONFIG_BOOTP_PREFER_SERVERIP=.*" "${defconfig}"; then
-    sed -i -E 's/CONFIG_BOOTP_PREFER_SERVERIP=.*/CONFIG_BOOTP_PREFER_SERVERIP=y/' "${defconfig}"
-  else
-    echo 'CONFIG_BOOTP_PREFER_SERVERIP=y' >> "${defconfig}"
-  fi
-
   if grep -Eqs "CONFIG_BOOTP_DNS2=.*" "${defconfig}"; then
     sed -i -E 's/CONFIG_BOOTP_DNS2=.*/CONFIG_BOOTP_DNS2=y/' "${defconfig}"
   else