defconfigs: remove references to old U-Boot versions

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>

17 files changed, 17 insertions, 303 deletions

diff --git a/configs/at91rm9200df_defconfig b/configs/at91rm9200df_defconfig
index 7d2bcfd2c..afa0aaffd 100644
--- a/configs/at91rm9200df_defconfig
+++ b/configs/at91rm9200df_defconfig
@@ -883,14 +883,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -898,23 +894,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -922,11 +903,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91rm9200df_ext_defconfig b/configs/at91rm9200df_ext_defconfig
index 79e55fce3..d549eacb6 100644
--- a/configs/at91rm9200df_ext_defconfig
+++ b/configs/at91rm9200df_ext_defconfig
@@ -809,14 +809,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -824,23 +820,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -848,11 +829,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9260dfc_defconfig b/configs/at91sam9260dfc_defconfig
index 087067f66..3865f6a9e 100644
--- a/configs/at91sam9260dfc_defconfig
+++ b/configs/at91sam9260dfc_defconfig
@@ -897,14 +897,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -912,23 +908,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -936,11 +917,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9260dfc_ext_defconfig b/configs/at91sam9260dfc_ext_defconfig
index e52cd2df8..46218a0e9 100644
--- a/configs/at91sam9260dfc_ext_defconfig
+++ b/configs/at91sam9260dfc_ext_defconfig
@@ -817,14 +817,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9261ek_defconfig b/configs/at91sam9261ek_defconfig
index cd7483b56..2f0bd5298 100644
--- a/configs/at91sam9261ek_defconfig
+++ b/configs/at91sam9261ek_defconfig
@@ -949,14 +949,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -964,23 +960,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -988,11 +969,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9261ek_ext_defconfig b/configs/at91sam9261ek_ext_defconfig
index 5ab47adbc..afb5fbe22 100644
--- a/configs/at91sam9261ek_ext_defconfig
+++ b/configs/at91sam9261ek_ext_defconfig
@@ -906,14 +906,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD is not set
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -921,23 +917,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -945,11 +926,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9263ek_defconfig b/configs/at91sam9263ek_defconfig
index bc95b6b61..22c4c0cce 100644
--- a/configs/at91sam9263ek_defconfig
+++ b/configs/at91sam9263ek_defconfig
@@ -946,14 +946,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -961,23 +957,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -985,11 +966,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9263ek_ext_defconfig b/configs/at91sam9263ek_ext_defconfig
index 9771c8352..f93b10a6e 100644
--- a/configs/at91sam9263ek_ext_defconfig
+++ b/configs/at91sam9263ek_ext_defconfig
@@ -868,14 +868,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -883,23 +879,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -907,11 +888,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9g20dfc_defconfig b/configs/at91sam9g20dfc_defconfig
index 30cc4e10b..3b5332918 100644
--- a/configs/at91sam9g20dfc_defconfig
+++ b/configs/at91sam9g20dfc_defconfig
@@ -813,14 +813,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="at91sam9g20ek"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -828,23 +824,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="256M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -852,11 +833,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/at91sam9g20dfc_ext_defconfig b/configs/at91sam9g20dfc_ext_defconfig
index e18754e34..053a9aa60 100644
--- a/configs/at91sam9g20dfc_ext_defconfig
+++ b/configs/at91sam9g20dfc_ext_defconfig
@@ -817,14 +817,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="$(BOARD_NAME)"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-BR2_TARGET_U_BOOT_ARCH_PATCH=y
 BR2_TARGET_U_BOOT_2009_01_ARCH_AT91=y
 BR2_TARGET_U_BOOT_ARCH_AT91_PATCH_DIR="target/device/Atmel/arch-arm/u-boot/2009.01"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASH is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_NANDFLASH is not set
@@ -832,23 +828,8 @@ BR2_TARGET_UBOOT_BOOTSOURCE_DATAFLASHCARD=y
 # BR2_TARGET_UBOOT_BOOTSOURCE_SDCARD is not set
 # BR2_TARGET_UBOOT_BOOTSOURCE_EEPROM is not set
 BR2_TARGET_UBOOT_BOOTSOURCE="dataflash"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_256MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-BR2_TARGET_UBOOT_SDRAM_SIZE_64MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="64M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
 BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_4MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_2MB is not set
@@ -856,11 +837,7 @@ BR2_TARGET_UBOOT_DATAFLASH_SIZE_8MB=y
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_50MB is not set
 # BR2_TARGET_UBOOT_DATAFLASH_SIZE_0_25MB is not set
 BR2_TARGET_UBOOT_END_OF_FLASH="C083FFFF"
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
 BR2_TARGET_UBOOT_KERNEL_LOCATION="C0042000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_LOCATION="C0252000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/atngw100-base_defconfig b/configs/atngw100-base_defconfig
index d3092df19..4b5b63369 100644
--- a/configs/atngw100-base_defconfig
+++ b/configs/atngw100-base_defconfig
@@ -739,16 +739,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 # BR2_TARGET_UBOOT_2009_03 is not set
 # BR2_TARGET_UBOOT_2009_01 is not set
 BR2_TARGET_UBOOT_2008_10=y
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2008.10"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
diff --git a/configs/atngw100_defconfig b/configs/atngw100_defconfig
index d7c9c1597..0c22b90fa 100644
--- a/configs/atngw100_defconfig
+++ b/configs/atngw100_defconfig
@@ -740,35 +740,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 # BR2_TARGET_UBOOT_2010_03 is not set
 # BR2_TARGET_UBOOT_2009_11 is not set
 BR2_TARGET_UBOOT_2009_08=y
-# BR2_TARGET_UBOOT_2009_06 is not set
-# BR2_TARGET_UBOOT_2009_03 is not set
-# BR2_TARGET_UBOOT_2009_01 is not set
-# BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.08"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-BR2_TARGET_UBOOT_DEFAULT_ENV=y
-BR2_TARGET_UBOOT_SDRAM_SIZE_256MB=y
-# BR2_TARGET_UBOOT_SDRAM_SIZE_128MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_64MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_32MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_16MB is not set
-# BR2_TARGET_UBOOT_SDRAM_SIZE_8MB is not set
-BR2_TARGET_UBOOT_MEMORY_SIZE="256M"
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_50MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_1_75MB is not set
-BR2_TARGET_UBOOT_KERNEL_SIZE_2_00MB=y
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_25MB is not set
-# BR2_TARGET_UBOOT_KERNEL_SIZE_2_50MB is not set
-BR2_TARGET_UBOOT_KERNEL_START="21000000"
-BR2_TARGET_UBOOT_FILESYSTEM_START="21210000"
-BR2_TARGET_UBOOT_FILESYSTEM_SIZE="6000000"
 BR2_TARGET_UBOOT_NETWORK=y
 BR2_TARGET_UBOOT_SERVERIP="10.175.196.221"
 BR2_TARGET_UBOOT_IPADDR="10.175.196.18"
diff --git a/configs/atstk1005_defconfig b/configs/atstk1005_defconfig
index a1fe0b7ec..213157b9d 100644
--- a/configs/atstk1005_defconfig
+++ b/configs/atstk1005_defconfig
@@ -771,16 +771,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atngw100"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
diff --git a/configs/atstk100x_defconfig b/configs/atstk100x_defconfig
index 0fbbf14a1..bbdf26fac 100644
--- a/configs/atstk100x_defconfig
+++ b/configs/atstk100x_defconfig
@@ -868,16 +868,10 @@ BR2_TARGET_UBOOT_BOARDNAME="atstk1002"
 # BR2_TARGET_UBOOT_2009_03 is not set
 # BR2_TARGET_UBOOT_2009_01 is not set
 BR2_TARGET_UBOOT_2008_10=y
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2008.10"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
diff --git a/configs/integrator926_defconfig b/configs/integrator926_defconfig
index 387927285..2c1169256 100644
--- a/configs/integrator926_defconfig
+++ b/configs/integrator926_defconfig
@@ -706,16 +706,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
diff --git a/configs/integrator926_huge_defconfig b/configs/integrator926_huge_defconfig
index 86443db8c..4aacbcbf8 100644
--- a/configs/integrator926_huge_defconfig
+++ b/configs/integrator926_huge_defconfig
@@ -682,16 +682,10 @@ BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="cp926ejs"
 BR2_TARGET_UBOOT_2009_01=y
 # BR2_TARGET_UBOOT_2008_10 is not set
-# BR2_TARGET_UBOOT_1_3_4 is not set
-# BR2_TARGET_UBOOT_1_2_0_ATMEL is not set
 BR2_UBOOT_VERSION="2009.01"
-BR2_U_BOOT_SITE="ftp://ftp.denx.de/pub/u-boot"
-# BR2_TARGET_U_BOOT_ARCH_PATCH is not set
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
-# BR2_TARGET_UBOOT_SILENT is not set
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set
-# BR2_TARGET_UBOOT_DEFAULT_ENV is not set
 
 #
 # Kernel
diff --git a/configs/v100sc2_defconfig b/configs/v100sc2_defconfig
index 0ad7ab077..1ee7a9ec2 100644
--- a/configs/v100sc2_defconfig
+++ b/configs/v100sc2_defconfig
@@ -706,13 +706,12 @@ BR2_TARGET_ROOTFS_TAR_OPTIONS=""
 #
 BR2_TARGET_UBOOT=y
 BR2_TARGET_UBOOT_BOARDNAME="atngw100"
-BR2_TARGET_UBOOT_CUSTOM_PATCH=""
+BR2_TARGET_UBOOT_CUSTOM_PATCH_DIR=""
 BR2_TARGET_UBOOT_SERVERIP="192.168.1.254"
 BR2_TARGET_UBOOT_IPADDR="192.168.1.60"
 BR2_TARGET_UBOOT_GATEWAY="192.168.1.254"
 BR2_TARGET_UBOOT_NETMASK="255.255.255.0"
 BR2_TARGET_UBOOT_ETHADDR="04:25:fe:ed:00:18"
-# BR2_TARGET_UBOOT_SILENT is not set
 # BR2_TARGET_UBOOT_TOOL_MKIMAGE is not set
 # BR2_TARGET_UBOOT_TOOL_ENV is not set