diff options
Diffstat (limited to 'bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch')
| -rw-r--r-- | bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch | 52 |
1 files changed, 52 insertions, 0 deletions
diff --git a/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch new file mode 100644 index 00000000..21794d20 --- /dev/null +++ b/bsp/meta-altera/recipes-bsp/u-boot/files/v2019.07/0011-ARM-socfpga-stratix10-Remove-CONFIG_OF_EMBED.patch @@ -0,0 +1,52 @@ +From 37814e55403a9ec5f852b58576618ba9a1936a20 Mon Sep 17 00:00:00 2001 +From: Dalon Westergreen <dalon.westergreen@intel.com> +Date: Fri, 10 May 2019 10:30:44 -0700 +Subject: [PATCH 11/12] ARM: socfpga: stratix10: Remove CONFIG_OF_EMBED + +CONFIG_OF_EMBED was primarily enabled to support the stratix10 +spl hex file requirements. Since this option now produces a +warning during build, and the spl hex can be created using +alternate methods, CONFIG_OF_EMBED is no longer needed. + +Signed-off-by: Dalon Westergreen <dalon.westergreen@intel.com> +--- + configs/socfpga_stratix10_defconfig | 1 - + include/configs/socfpga_stratix10_socdk.h | 4 ++-- + 2 files changed, 2 insertions(+), 3 deletions(-) + +diff --git a/configs/socfpga_stratix10_defconfig b/configs/socfpga_stratix10_defconfig +index fbab388b43..f27180385d 100644 +--- a/configs/socfpga_stratix10_defconfig ++++ b/configs/socfpga_stratix10_defconfig +@@ -26,7 +26,6 @@ CONFIG_CMD_CACHE=y + CONFIG_CMD_EXT4=y + CONFIG_CMD_FAT=y + CONFIG_CMD_FS_GENERIC=y +-CONFIG_OF_EMBED=y + CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk" + CONFIG_ENV_IS_IN_MMC=y + CONFIG_NET_RANDOM_ETHADDR=y +diff --git a/include/configs/socfpga_stratix10_socdk.h b/include/configs/socfpga_stratix10_socdk.h +index 39d757d737..e93c598be9 100644 +--- a/include/configs/socfpga_stratix10_socdk.h ++++ b/include/configs/socfpga_stratix10_socdk.h +@@ -197,7 +197,7 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); + * 0x8000_0000 ...... End of SDRAM_1 (assume 2GB) + * + */ +-#define CONFIG_SPL_TARGET "spl/u-boot-spl.hex" ++#define CONFIG_SPL_TARGET "spl/u-boot-spl-dtb.hex" + #define CONFIG_SPL_MAX_SIZE CONFIG_SYS_INIT_RAM_SIZE + #define CONFIG_SPL_STACK CONFIG_SYS_INIT_SP_ADDR + #define CONFIG_SPL_BSS_MAX_SIZE 0x100000 /* 1 MB */ +@@ -210,6 +210,6 @@ unsigned int cm_get_l4_sys_free_clk_hz(void); + + /* SPL SDMMC boot support */ + #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 +-#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" ++#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot-dtb.img" + + #endif /* __CONFIG_H */ +-- +2.21.0 + |