diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.spl | 9 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 8 |
2 files changed, 8 insertions, 9 deletions
diff --git a/scripts/Makefile.spl b/scripts/Makefile.spl index e494d185e4..7416abec62 100644 --- a/scripts/Makefile.spl +++ b/scripts/Makefile.spl @@ -45,6 +45,13 @@ SPL_ := SPL_TPL_ := endif +ifeq ($(obj)$(CONFIG_SUPPORT_SPL),spl) +$(error You cannot build SPL without enabling CONFIG_SUPPORT_SPL) +endif +ifeq ($(obj)$(CONFIG_SUPPORT_TPL),tpl) +$(error You cannot build TPL without enabling CONFIG_SUPPORT_TPL) +endif + include $(srctree)/config.mk include $(srctree)/arch/$(ARCH)/Makefile @@ -364,7 +371,7 @@ $(u-boot-spl-dirs): $(u-boot-spl-platdata) quiet_cmd_cpp_lds = LDS $@ cmd_cpp_lds = $(CPP) -Wp,-MD,$(depfile) $(cpp_flags) $(LDPPFLAGS) -ansi \ - -D__ASSEMBLY__ -x assembler-with-cpp -P -o $@ $< + -D__ASSEMBLY__ -x assembler-with-cpp -std=c99 -P -o $@ $< $(obj)/u-boot-spl.lds: $(LDSCRIPT) FORCE $(call if_changed_dep,cpp_lds) diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fe82419d66..94c0f1ff82 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -614,9 +614,7 @@ CONFIG_FLASHBOOTCOMMAND CONFIG_FLASHCARD CONFIG_FLASH_BASE CONFIG_FLASH_BR_PRELIM -CONFIG_FLASH_CFI_DRIVER CONFIG_FLASH_CFI_LEGACY -CONFIG_FLASH_CFI_MTD CONFIG_FLASH_END CONFIG_FLASH_NOT_MEM_MAPPED CONFIG_FLASH_OR_PRELIM @@ -1176,8 +1174,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_LPC32XX_SDRAM_ -CONFIG_LPC32XX_SPL CONFIG_LPC32XX_SSP_TIMEOUT CONFIG_LPC_BASE CONFIG_LPC_IO_BASE @@ -1671,7 +1667,6 @@ CONFIG_RTC_IMXDI CONFIG_RTC_M41T11 CONFIG_RTC_M41T62 CONFIG_RTC_MC13XXX -CONFIG_RTC_MC146818 CONFIG_RTC_MCFRRTC CONFIG_RTC_MCP79411 CONFIG_RTC_MXS @@ -2587,7 +2582,6 @@ CONFIG_SYS_FLASH_BASE_PHYS CONFIG_SYS_FLASH_BASE_PHYS_EARLY CONFIG_SYS_FLASH_BASE_PHYS_LOW CONFIG_SYS_FLASH_BR_PRELIM -CONFIG_SYS_FLASH_CFI CONFIG_SYS_FLASH_CFI_AMD_RESET CONFIG_SYS_FLASH_CFI_BROKEN_TABLE CONFIG_SYS_FLASH_CFI_NONBLOCK @@ -2602,13 +2596,11 @@ CONFIG_SYS_FLASH_LEGACY_512Kx8 CONFIG_SYS_FLASH_LOCK_TOUT CONFIG_SYS_FLASH_OR_PRELIM CONFIG_SYS_FLASH_PARMSECT_SZ -CONFIG_SYS_FLASH_PROTECTION CONFIG_SYS_FLASH_QUIET_TEST CONFIG_SYS_FLASH_SECT_SIZE CONFIG_SYS_FLASH_SECT_SZ CONFIG_SYS_FLASH_SIZE CONFIG_SYS_FLASH_UNLOCK_TOUT -CONFIG_SYS_FLASH_USE_BUFFER_WRITE CONFIG_SYS_FLASH_VERIFY_AFTER_WRITE CONFIG_SYS_FLASH_WRITE_TOUT CONFIG_SYS_FLYCNFG_VAL |