summaryrefslogtreecommitdiffstats
path: root/configs
diff options
context:
space:
mode:
authorRick Altherr <raltherr@google.com>2016-12-07 10:06:36 -0800
committerJoel Stanley <joel@jms.id.au>2016-12-08 10:17:29 +1100
commitdeddff7930e690edaf229c411c3bf5a7bc4990ed (patch)
tree25443b404e2f40efaa888e13326e780d03280a6d /configs
parent6b26bf14ae6eb982203b9e6491e8a630a690d963 (diff)
downloadtalos-obmc-uboot-deddff7930e690edaf229c411c3bf5a7bc4990ed.tar.gz
talos-obmc-uboot-deddff7930e690edaf229c411c3bf5a7bc4990ed.zip
Enable FIT image support and FDT loading for AST2400/AST2500
FIT is the modern U-Boot native image format for kernels, device trees, and ramdisks. Enabling FIT only compiles in support for the image format. For these devices, the kernel+dtb and ramdisk are loaded from separate locations in flash and can be any mix of legacy or FIT images. When using FIT images, the dtb is stored as a separate entry that requires CONFIG_OF_LIBFDT to load it into RAM and pass it to the kernel. U-Boot enables EFI support by default but it only builds once FIT support is enabled. EFI support adds ~13k to the binary and is currently unused for any Aspeed platforms. Explicitly disable EFI support now that FIT support is enabled. Tested under qemu with both legacy and FIT kernel+dtb images for palmetto and witherspoon. Signed-off-by: Rick Altherr <raltherr@google.com> Reviewed-by: Simon Glass <sjg@chromium.org> Reviewed-by: Cédric Le Goater <clg@kaod.org> Signed-off-by: Joel Stanley <joel@jms.id.au>
Diffstat (limited to 'configs')
-rw-r--r--configs/ast_g4_ncsi_defconfig5
-rw-r--r--configs/ast_g4_phy_defconfig5
-rw-r--r--configs/ast_g5_ncsi_defconfig5
-rw-r--r--configs/ast_g5_phy_defconfig5
4 files changed, 20 insertions, 0 deletions
diff --git a/configs/ast_g4_ncsi_defconfig b/configs/ast_g4_ncsi_defconfig
index 4ee71c5d9a..ab4907cfe2 100644
--- a/configs/ast_g4_ncsi_defconfig
+++ b/configs/ast_g4_ncsi_defconfig
@@ -1,7 +1,12 @@
CONFIG_ARM=y
CONFIG_TARGET_AST_G4=y
CONFIG_SYS_PROMPT="ast# "
+CONFIG_CMD_BOOTEFI=n
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
+CONFIG_EFI_LOADER=n
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_OF_LIBFDT=y
CONFIG_SPI_FLASH=y
CONFIG_SYS_NS16550=y
diff --git a/configs/ast_g4_phy_defconfig b/configs/ast_g4_phy_defconfig
index 61fd69b468..21a56c4b96 100644
--- a/configs/ast_g4_phy_defconfig
+++ b/configs/ast_g4_phy_defconfig
@@ -2,7 +2,12 @@ CONFIG_ARM=y
CONFIG_TARGET_AST_G4=y
CONFIG_ASPEED_NET_PHY=y
CONFIG_SYS_PROMPT="ast# "
+CONFIG_CMD_BOOTEFI=n
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
+CONFIG_EFI_LOADER=n
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_OF_LIBFDT=y
CONFIG_SPI_FLASH=y
CONFIG_SYS_NS16550=y
diff --git a/configs/ast_g5_ncsi_defconfig b/configs/ast_g5_ncsi_defconfig
index 6d11afbbc6..7cd4fd116d 100644
--- a/configs/ast_g5_ncsi_defconfig
+++ b/configs/ast_g5_ncsi_defconfig
@@ -1,7 +1,12 @@
CONFIG_ARM=y
CONFIG_TARGET_AST_G5=y
CONFIG_SYS_PROMPT="ast# "
+CONFIG_CMD_BOOTEFI=n
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
+CONFIG_EFI_LOADER=n
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_OF_LIBFDT=y
CONFIG_SPI_FLASH=y
CONFIG_SYS_NS16550=y
diff --git a/configs/ast_g5_phy_defconfig b/configs/ast_g5_phy_defconfig
index 20f62e08f5..c686dd2297 100644
--- a/configs/ast_g5_phy_defconfig
+++ b/configs/ast_g5_phy_defconfig
@@ -2,7 +2,12 @@ CONFIG_ARM=y
CONFIG_TARGET_AST_G5=y
CONFIG_ASPEED_NET_PHY=y
CONFIG_SYS_PROMPT="ast# "
+CONFIG_CMD_BOOTEFI=n
CONFIG_CMD_DHCP=y
CONFIG_CMD_PING=y
+CONFIG_EFI_LOADER=n
+CONFIG_FIT=y
+CONFIG_FIT_VERBOSE=y
+CONFIG_OF_LIBFDT=y
CONFIG_SPI_FLASH=y
CONFIG_SYS_NS16550=y
OpenPOWER on IntegriCloud