From 2abbbbd1fabfa1ff823ec8e979fcf6b53b4b8bad Mon Sep 17 00:00:00 2001 From: Pascal Vizeli Date: Wed, 20 Jun 2018 10:41:45 +0000 Subject: [PATCH] Cleanup uboot handling like linux kernel --- .../board/raspberrypi/rpi/uboot.config | 3 --- .../board/raspberrypi/rpi0-w/uboot.config | 3 --- .../board/raspberrypi/rpi2/uboot.config | 4 --- .../board/raspberrypi/rpi3-64/uboot.config | 6 ----- .../board/raspberrypi/rpi3/uboot.config | 6 ----- .../board/raspberrypi/uboot.config | 27 +++---------------- buildroot-external/bootloader/uboot.config | 3 --- buildroot-external/configs/rpi0_w_defconfig | 3 +-- buildroot-external/configs/rpi2_defconfig | 3 +-- buildroot-external/configs/rpi3_64_defconfig | 3 +-- buildroot-external/configs/rpi3_defconfig | 3 +-- buildroot-external/configs/rpi_defconfig | 3 +-- 12 files changed, 8 insertions(+), 59 deletions(-) delete mode 100644 buildroot-external/board/raspberrypi/rpi/uboot.config delete mode 100644 buildroot-external/board/raspberrypi/rpi0-w/uboot.config delete mode 100644 buildroot-external/board/raspberrypi/rpi2/uboot.config delete mode 100644 buildroot-external/board/raspberrypi/rpi3-64/uboot.config delete mode 100644 buildroot-external/board/raspberrypi/rpi3/uboot.config diff --git a/buildroot-external/board/raspberrypi/rpi/uboot.config b/buildroot-external/board/raspberrypi/rpi/uboot.config deleted file mode 100644 index b2a22b5e1..000000000 --- a/buildroot-external/board/raspberrypi/rpi/uboot.config +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_TARGET_RPI=y -CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-b" -CONFIG_SYS_TEXT_BASE=0x00008000 diff --git a/buildroot-external/board/raspberrypi/rpi0-w/uboot.config b/buildroot-external/board/raspberrypi/rpi0-w/uboot.config deleted file mode 100644 index 0b4f39372..000000000 --- a/buildroot-external/board/raspberrypi/rpi0-w/uboot.config +++ /dev/null @@ -1,3 +0,0 @@ -CONFIG_TARGET_RPI_0_W=y -CONFIG_DEFAULT_DEVICE_TREE="bcm2835-rpi-zero-w" -CONFIG_SYS_TEXT_BASE=0x00008000 diff --git a/buildroot-external/board/raspberrypi/rpi2/uboot.config b/buildroot-external/board/raspberrypi/rpi2/uboot.config deleted file mode 100644 index 4b9c35d07..000000000 --- a/buildroot-external/board/raspberrypi/rpi2/uboot.config +++ /dev/null @@ -1,4 +0,0 @@ -CONFIG_TARGET_RPI_2=y -CONFIG_DEFAULT_DEVICE_TREE="bcm2836-rpi-2-b" -CONFIG_SYS_TEXT_BASE=0x00008000 -CONFIG_SYS_TEXT_BASE=0x00008000 diff --git a/buildroot-external/board/raspberrypi/rpi3-64/uboot.config b/buildroot-external/board/raspberrypi/rpi3-64/uboot.config deleted file mode 100644 index 550b90c67..000000000 --- a/buildroot-external/board/raspberrypi/rpi3-64/uboot.config +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_TARGET_RPI_3=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_TEXT_BASE=0x00080000 -CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" -CONFIG_PHYLIB=y -CONFIG_USB_ETHER_LAN78XX=y diff --git a/buildroot-external/board/raspberrypi/rpi3/uboot.config b/buildroot-external/board/raspberrypi/rpi3/uboot.config deleted file mode 100644 index 1290a4ba9..000000000 --- a/buildroot-external/board/raspberrypi/rpi3/uboot.config +++ /dev/null @@ -1,6 +0,0 @@ -CONFIG_TARGET_RPI_3_32B=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_TEXT_BASE=0x00008000 -CONFIG_DEFAULT_DEVICE_TREE="bcm2837-rpi-3-b" -CONFIG_PHYLIB=y -CONFIG_USB_ETHER_LAN78XX=y diff --git a/buildroot-external/board/raspberrypi/uboot.config b/buildroot-external/board/raspberrypi/uboot.config index f9c0cf01c..0043ca31e 100644 --- a/buildroot-external/board/raspberrypi/uboot.config +++ b/buildroot-external/board/raspberrypi/uboot.config @@ -1,24 +1,3 @@ -CONFIG_ARM=y -CONFIG_ARCH_BCM283X=y -CONFIG_OF_BOARD_SETUP=y -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_GPIO=y -CONFIG_CMD_MMC=y -CONFIG_CMD_USB=y -CONFIG_OF_EMBED=y -CONFIG_DM_KEYBOARD=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_BCM2835=y -CONFIG_DM_ETH=y -CONFIG_PINCTRL=y -# CONFIG_PINCTRL_GENERIC is not set -# CONFIG_REQUIRE_SERIAL_CONSOLE is not set -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_DWC2=y -CONFIG_USB_KEYBOARD=y -CONFIG_USB_HOST_ETHER=y -CONFIG_USB_ETHER_SMSC95XX=y -CONFIG_DM_VIDEO=y -CONFIG_PHYS_TO_BUS=y +# CONFIG_USB_STORAGE is not set +# CONFIG_ENV_FAT_INTERFACE is not set +# CONFIG_ENV_FAT_DEVICE_AND_PART is not set diff --git a/buildroot-external/bootloader/uboot.config b/buildroot-external/bootloader/uboot.config index de619a0f3..ab447877b 100644 --- a/buildroot-external/bootloader/uboot.config +++ b/buildroot-external/bootloader/uboot.config @@ -13,7 +13,4 @@ CONFIG_FS_EXT4=y # CONFIG_ENV_IS_IN_EXT4 is not set CONFIG_ENV_IS_IN_MMC=y CONFIG_CONSOLE_SCROLL_LINES=10 -CONFIG_SYS_WHITE_ON_BLACK=y -CONFIG_REGEX=y -CONFIG_OF_LIBFDT_OVERLAY=y # CONFIG_EFI_LOADER is not set diff --git a/buildroot-external/configs/rpi0_w_defconfig b/buildroot-external/configs/rpi0_w_defconfig index fca796cb9..fae1ecff8 100644 --- a/buildroot-external/configs/rpi0_w_defconfig +++ b/buildroot-external/configs/rpi0_w_defconfig @@ -69,8 +69,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi0-w/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_0_w" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_BOOT_SCRIPT=y diff --git a/buildroot-external/configs/rpi2_defconfig b/buildroot-external/configs/rpi2_defconfig index 476193d44..a96cebdd2 100644 --- a/buildroot-external/configs/rpi2_defconfig +++ b/buildroot-external/configs/rpi2_defconfig @@ -68,8 +68,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi2/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_2" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_BOOT_SCRIPT=y diff --git a/buildroot-external/configs/rpi3_64_defconfig b/buildroot-external/configs/rpi3_64_defconfig index e3bc7ba6d..88340db37 100644 --- a/buildroot-external/configs/rpi3_64_defconfig +++ b/buildroot-external/configs/rpi3_64_defconfig @@ -69,8 +69,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3-64/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_BOOT_SCRIPT=y diff --git a/buildroot-external/configs/rpi3_defconfig b/buildroot-external/configs/rpi3_defconfig index 998a089d8..39c1b814c 100644 --- a/buildroot-external/configs/rpi3_defconfig +++ b/buildroot-external/configs/rpi3_defconfig @@ -69,8 +69,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi3/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi_3_32b" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_BOOT_SCRIPT=y diff --git a/buildroot-external/configs/rpi_defconfig b/buildroot-external/configs/rpi_defconfig index 1e3880894..b9a25400c 100644 --- a/buildroot-external/configs/rpi_defconfig +++ b/buildroot-external/configs/rpi_defconfig @@ -68,8 +68,7 @@ BR2_TARGET_UBOOT=y BR2_TARGET_UBOOT_BUILD_SYSTEM_KCONFIG=y BR2_TARGET_UBOOT_CUSTOM_VERSION=y BR2_TARGET_UBOOT_CUSTOM_VERSION_VALUE="2018.05" -BR2_TARGET_UBOOT_USE_CUSTOM_CONFIG=y -BR2_TARGET_UBOOT_CUSTOM_CONFIG_FILE="$(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/rpi/uboot.config" +BR2_TARGET_UBOOT_BOARD_DEFCONFIG="rpi" BR2_TARGET_UBOOT_CONFIG_FRAGMENT_FILES="$(BR2_EXTERNAL_HASSOS_PATH)/bootloader/uboot.config $(BR2_EXTERNAL_HASSOS_PATH)/board/raspberrypi/uboot.config" BR2_TARGET_UBOOT_NEEDS_DTC=y BR2_TARGET_UBOOT_BOOT_SCRIPT=y