diff options
Diffstat (limited to 'scripts')
| -rw-r--r-- | scripts/Makefile.lib | 4 | ||||
| -rw-r--r-- | scripts/config_whitelist.txt | 73 |
2 files changed, 2 insertions, 75 deletions
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 23be324369..774aa89a3f 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -308,10 +308,10 @@ $(obj)/%.dtb.S: $(obj)/%.dtb quiet_cmd_dtc = DTC $@ # Modified for U-Boot -# Bring in any U-Boot-specific include after the '/dts-v1/;' header +# Bring in any U-Boot-specific include at the end of the file cmd_dtc = mkdir -p $(dir ${dtc-tmp}) ; \ cat $< $(if $(u_boot_dtsi),\ - | sed '/^\/ {$$/{x;s%$$%\#include \"$(u_boot_dtsi)\"%;G;}') | \ + | sed "$$ a\#include \"$(u_boot_dtsi)\"") | \ $(CPP) $(dtc_cpp_flags) -x assembler-with-cpp -o $(dtc-tmp) - ; \ $(DTC) -O dtb -o $@ -b 0 \ -i $(dir $<) $(DTC_FLAGS) \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index fa9c3fc8cb..8c8e4d2078 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -383,48 +383,6 @@ CONFIG_CM922T_XA10 CONFIG_CMDLINE_EDITING CONFIG_CMDLINE_PS_SUPPORT CONFIG_CMDLINE_TAG -CONFIG_CMD_DS4510 -CONFIG_CMD_DS4510_INFO -CONFIG_CMD_DS4510_MEM -CONFIG_CMD_DS4510_RST -CONFIG_CMD_DTT -CONFIG_CMD_ECCTEST -CONFIG_CMD_EECONFIG -CONFIG_CMD_EEPROM -CONFIG_CMD_EEPROM_LAYOUT -CONFIG_CMD_ENTERRCM -CONFIG_CMD_ENV -CONFIG_CMD_ENV_CALLBACK -CONFIG_CMD_ENV_FLAGS -CONFIG_CMD_ERRATA -CONFIG_CMD_ESBC_VALIDATE -CONFIG_CMD_ETHSW -CONFIG_CMD_FDC -CONFIG_CMD_FDT_MAX_DUMP -CONFIG_CMD_FPGAD -CONFIG_CMD_FPGA_LOADBP -CONFIG_CMD_FPGA_LOADFS -CONFIG_CMD_FPGA_LOADMK -CONFIG_CMD_FPGA_LOADP -CONFIG_CMD_FUSE -CONFIG_CMD_GETTIME -CONFIG_CMD_GSC -CONFIG_CMD_HASH -CONFIG_CMD_HD44760 -CONFIG_CMD_HD44780 -CONFIG_CMD_HDMIDETECT -CONFIG_CMD_IDE -CONFIG_CMD_IMMAP -CONFIG_CMD_IMXOTP -CONFIG_CMD_IMX_FUSE -CONFIG_CMD_IO -CONFIG_CMD_IOLOOP -CONFIG_CMD_IOTRACE -CONFIG_CMD_IRQ -CONFIG_CMD_JFFS2 -CONFIG_CMD_KGDB -CONFIG_CMD_LOADY -CONFIG_CMD_LZMADEC CONFIG_CMD_MAX6957 CONFIG_CMD_MEM CONFIG_CMD_MFSL @@ -685,22 +643,7 @@ CONFIG_DRIVE_MMC CONFIG_DRIVE_SATA CONFIG_DRIVE_TYPES CONFIG_DRIVE_USB -CONFIG_DS4510 CONFIG_DSP_CLUSTER_START -CONFIG_DTT -CONFIG_DTT_AD7414 -CONFIG_DTT_ADM1021 -CONFIG_DTT_DS1621 -CONFIG_DTT_DS1775 -CONFIG_DTT_DS620 -CONFIG_DTT_HYSTERESIS -CONFIG_DTT_LM63 -CONFIG_DTT_LM75 -CONFIG_DTT_MAX_TEMP -CONFIG_DTT_MIN_TEMP -CONFIG_DTT_PWM_LOOKUPTABLE -CONFIG_DTT_SENSORS -CONFIG_DTT_TACH_LIMIT CONFIG_DUOVERO CONFIG_DV_USBPHY_CTL CONFIG_DWC2_DFLT_SPEED_FULL @@ -765,7 +708,6 @@ CONFIG_EDB93XX_SDCS2 CONFIG_EDB93XX_SDCS3 CONFIG_EEPRO100 CONFIG_EEPRO100_SROM_WRITE -CONFIG_EEPROM_LAYOUT_HELP_STRING CONFIG_EFLASH_PROTSECTORS CONFIG_EHCI_DESC_BIG_ENDIAN CONFIG_EHCI_HCD_INIT_AFTER_RESET @@ -947,7 +889,6 @@ CONFIG_FFUART CONFIG_FILE CONFIG_FIRMWARE_OFFSET CONFIG_FIRMWARE_SIZE -CONFIG_FIT_DISABLE_SHA256 CONFIG_FIXED_PHY CONFIG_FIXED_PHY_ADDR CONFIG_FIXED_SDHCI_ALIGNED_BUFFER @@ -1633,7 +1574,6 @@ CONFIG_LUAN CONFIG_LWMON5 CONFIG_LXT971_NO_SLEEP CONFIG_LYNXKDI -CONFIG_LZMA CONFIG_M41T94_SPI_CS CONFIG_M520x CONFIG_M52277EVB @@ -2352,7 +2292,6 @@ CONFIG_RTC_MV CONFIG_RTC_MXS CONFIG_RTC_PCF8563 CONFIG_RTC_PT7C4338 -CONFIG_RTC_RTC4543 CONFIG_RTC_RV3029 CONFIG_RTC_RX8025 CONFIG_RTC_X1205 @@ -2585,7 +2524,6 @@ CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA CONFIG_SOFT_I2C_READ_REPEATED_START CONFIG_SOFT_SPI -CONFIG_SOFT_TWS CONFIG_SOURCE CONFIG_SPARSE_RCU_POINTER CONFIG_SPDDRAM_SILENT @@ -3458,12 +3396,6 @@ CONFIG_SYS_DSPI_CTAR4 CONFIG_SYS_DSPI_CTAR5 CONFIG_SYS_DSPI_CTAR6 CONFIG_SYS_DSPI_CTAR7 -CONFIG_SYS_DTT_ADM1021 -CONFIG_SYS_DTT_BUS_NUM -CONFIG_SYS_DTT_HYSTERESIS -CONFIG_SYS_DTT_LOW_TEMP -CONFIG_SYS_DTT_MAX_TEMP -CONFIG_SYS_DTT_MIN_TEMP CONFIG_SYS_DUART_RST CONFIG_SYS_DV_CLKMODE CONFIG_SYS_DV_NOR_BOOT_CFG @@ -3518,7 +3450,6 @@ CONFIG_SYS_EXTBDINFO CONFIG_SYS_EXTRA_ENV_RELOC CONFIG_SYS_EXT_SERIAL_CLOCK CONFIG_SYS_FAST_CLK -CONFIG_SYS_FAULT_ECCONFIG_SYS_NO_FLASHHO_LINK_DOWN CONFIG_SYS_FAULT_ECHO_LINK_DOWN CONFIG_SYS_FAULT_MII_ADDR CONFIG_SYS_FCC_PSMR @@ -4205,13 +4136,10 @@ CONFIG_SYS_I2C_CLK_OFFSET CONFIG_SYS_I2C_DAVINCI CONFIG_SYS_I2C_DIRECT_BUS CONFIG_SYS_I2C_DPMEM_OFFSET -CONFIG_SYS_I2C_DS1621_ADDR -CONFIG_SYS_I2C_DS4510_ADDR CONFIG_SYS_I2C_DSPIC_2_ADDR CONFIG_SYS_I2C_DSPIC_ADDR CONFIG_SYS_I2C_DSPIC_IO_ADDR CONFIG_SYS_I2C_DSPIC_KEYB_ADDR -CONFIG_SYS_I2C_DTT_ADDR CONFIG_SYS_I2C_DVI_ADDR CONFIG_SYS_I2C_DVI_BUS_NUM CONFIG_SYS_I2C_EARLY_INIT @@ -6124,7 +6052,6 @@ CONFIG_TIZEN CONFIG_TI_KEYSTONE_SERDES CONFIG_TI_KSNAV CONFIG_TI_SPI_MMAP -CONFIG_TMU_CMD_DTT CONFIG_TMU_TIMER CONFIG_TOTAL5200 CONFIG_TPL_DRIVERS_MISC_SUPPORT |