From 57c3afbc27bc48c3029108748fc2101b8d4758d8 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 16 Nov 2022 13:10:26 -0500 Subject: powerpc: Rename CONFIG_NS16550_MIN_FUNCTIONS This symbol is specific to the PowerPC SPL implementation, so rename this to reflect that it's in SPL and used / tested there, so that we can then safely migrate it to Kconfig. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- scripts/config_whitelist.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index c0f55e41a5..3e717bb72a 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -186,7 +186,6 @@ CONFIG_NETMASK CONFIG_NEVER_ASSERT_ODT_TO_CPU CONFIG_NOBQFMAN CONFIG_NORBOOT -CONFIG_NS16550_MIN_FUNCTIONS CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN CONFIG_OTHBOOTARGS @@ -278,6 +277,7 @@ CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET +CONFIG_SPL_NS16550_MIN_FUNCTIONS CONFIG_SRIO1 CONFIG_SRIO2 CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET -- cgit v1.2.3 From 5bacad64627447c4c890ff0b41757cfb09c2204a Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 19 Nov 2022 18:45:41 -0500 Subject: configs: Resync with savedefconfig Rsync all defconfig files using moveconfig.py Signed-off-by: Tom Rini --- scripts/config_whitelist.txt | 734 ------------------------------------------- 1 file changed, 734 deletions(-) (limited to 'scripts') diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 3e717bb72a..ccc3a73197 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -37,24 +37,18 @@ CONFIG_FLASH_SHOW_PROGRESS CONFIG_FLASH_SPANSION_S29WS_N CONFIG_FLASH_VERIFY CONFIG_FM_PLAT_CLK_DIV -CONFIG_FSL_CADMUS CONFIG_FSL_CPLD -CONFIG_FSL_DEVICE_DISABLE CONFIG_FSL_ESDHC_PIN_MUX CONFIG_FSL_FM_10GEC_REGULAR_NOTATION -CONFIG_FSL_IIM CONFIG_FSL_ISBC_KEY_EXT -CONFIG_FSL_LBC CONFIG_FSL_PMIC_BITLEN CONFIG_FSL_PMIC_BUS CONFIG_FSL_PMIC_CLK CONFIG_FSL_PMIC_CS CONFIG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 -CONFIG_FSL_SERDES CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 -CONFIG_FTMAC100_BASE CONFIG_FTRTC010_EXTCLK CONFIG_FTRTC010_PCLK CONFIG_GATEWAYIP @@ -64,10 +58,8 @@ CONFIG_G_DNL_THOR_VENDOR_NUM CONFIG_G_DNL_UMS_PRODUCT_NUM CONFIG_G_DNL_UMS_VENDOR_NUM CONFIG_HDMI_ENCODER_I2C_ADDR -CONFIG_HIKEY_GPIO CONFIG_HOSTNAME CONFIG_HSMMC2_8BIT -CONFIG_HWCONFIG CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS @@ -77,15 +69,7 @@ CONFIG_I2C_MVTWSI_BASE0 CONFIG_I2C_MVTWSI_BASE1 CONFIG_I2C_RTC_ADDR CONFIG_ICS307_REFCLK_HZ -CONFIG_IMX CONFIG_IMX6_PWM_PER_CLK -CONFIG_IMX_HDMI -CONFIG_IMX_VIDEO_SKIP -CONFIG_INTERRUPTS -CONFIG_IODELAY_RECALIBRATION -CONFIG_IOMUX_LPSR -CONFIG_IOMUX_SHARE_CONF_REG -CONFIG_IO_TRACE CONFIG_IPADDR CONFIG_IRAM_BASE CONFIG_IRAM_END @@ -122,7 +106,6 @@ CONFIG_L2_CACHE CONFIG_LEGACY_BOOTCMD_ENV CONFIG_LOWPOWER_ADDR CONFIG_LOWPOWER_FLAG -CONFIG_LPC32XX_HSUART CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY CONFIG_LPC32XX_NAND_MLC_NAND_TA CONFIG_LPC32XX_NAND_MLC_RD_HIGH @@ -138,7 +121,6 @@ CONFIG_LPC32XX_NAND_SLC_WDR_CLKS CONFIG_LPC32XX_NAND_SLC_WHOLD CONFIG_LPC32XX_NAND_SLC_WSETUP CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_LS102XA_STREAM_ID CONFIG_MACB_SEARCH_PHY CONFIG_MALLOC_F_ADDR CONFIG_MALTA @@ -149,7 +131,6 @@ CONFIG_MEMSIZE_IN_BYTES CONFIG_MEM_INIT_VALUE CONFIG_MFG_ENV_SETTINGS CONFIG_MII_DEFAULT_TSEC -CONFIG_MISC_COMMON CONFIG_MIU_2BIT_21_7_INTERLEAVED CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV @@ -161,8 +142,6 @@ CONFIG_MTD_NAND_VERIFY_WRITE CONFIG_MTD_PARTITION CONFIG_MVGBE_PORTS CONFIG_MVS -CONFIG_MX27 -CONFIG_MX27_CLK32 CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE @@ -172,25 +151,19 @@ CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT CONFIG_MXC_USB_PORTSC CONFIG_MXS -CONFIG_MXS_OCOTP CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_CS_INIT -CONFIG_NAND_ECC_BCH -CONFIG_NAND_KIRKWOOD -CONFIG_NAND_KMETER1 CONFIG_NAND_OMAP_GPMC_WSCFG CONFIG_NAND_SECBOOT CONFIG_NAND_SPL CONFIG_NETDEV CONFIG_NETMASK CONFIG_NEVER_ASSERT_ODT_TO_CPU -CONFIG_NOBQFMAN CONFIG_NORBOOT CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE -CONFIG_PCA953X CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO CONFIG_PEN_ADDR_BIG_ENDIAN @@ -207,20 +180,9 @@ CONFIG_POST CONFIG_POSTBOOTMENU CONFIG_POST_EXTERNAL_WORD_FUNCS CONFIG_POST_SKIP_ENV_FLAGS -CONFIG_POWER_FSL -CONFIG_POWER_FSL_MC13892 -CONFIG_POWER_HI6553 -CONFIG_POWER_LTC3676 CONFIG_POWER_LTC3676_I2C_ADDR -CONFIG_POWER_PFUZE100 CONFIG_POWER_PFUZE100_I2C_ADDR -CONFIG_POWER_PFUZE3000 CONFIG_POWER_PFUZE3000_I2C_ADDR -CONFIG_POWER_SPI -CONFIG_POWER_TPS62362 -CONFIG_POWER_TPS65090_EC -CONFIG_POWER_TPS65218 -CONFIG_POWER_TPS65910 CONFIG_PPC_SPINTABLE_COMPATIBLE CONFIG_PRAM CONFIG_PSRAM_SCFG @@ -232,14 +194,6 @@ CONFIG_RD_LVL CONFIG_RESET_VECTOR_ADDRESS CONFIG_ROCKCHIP_SDHCI_MAX_FREQ CONFIG_ROOTPATH -CONFIG_RTC_DS1337 -CONFIG_RTC_DS1337_NOOSC -CONFIG_RTC_DS1338 -CONFIG_RTC_DS1374 -CONFIG_RTC_DS3231 -CONFIG_RTC_MC13XXX -CONFIG_RTC_MXS -CONFIG_RTC_PT7C4338 CONFIG_SANDBOX_ARCH CONFIG_SANDBOX_SDL CONFIG_SANDBOX_SPI_MAX_BUS @@ -261,700 +215,25 @@ CONFIG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE CONFIG_SH_ETHER_SH7734_MII CONFIG_SH_ETHER_USE_PORT -CONFIG_SH_GPIO_PFC CONFIG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR -CONFIG_SMSC_LPC47M -CONFIG_SMSC_SIO1007 CONFIG_SOCRATES CONFIG_SOFT_I2C_READ_REPEATED_START -CONFIG_SPD_EEPROM CONFIG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD CONFIG_SPI_FLASH_SIZE CONFIG_SPI_HALF_DUPLEX CONFIG_SPI_N25Q256A_RESET -CONFIG_SPL_NS16550_MIN_FUNCTIONS -CONFIG_SRIO1 -CONFIG_SRIO2 -CONFIG_SRIO_PCIE_BOOT_BRR_OFFSET -CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS1 -CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_BUS2 -CONFIG_SRIO_PCIE_BOOT_IMAGE_MEM_PHYS -CONFIG_SRIO_PCIE_BOOT_IMAGE_SIZE -CONFIG_SRIO_PCIE_BOOT_MASTER -CONFIG_SRIO_PCIE_BOOT_RELEASE_MASK -CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_BUS -CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_MEM_PHYS -CONFIG_SRIO_PCIE_BOOT_UCODE_ENV_SIZE CONFIG_STACKBASE CONFIG_STANDALONE_LOAD_ADDR CONFIG_STD_DEVICES_SETTINGS -CONFIG_SYS_AMASK0 -CONFIG_SYS_AMASK1 -CONFIG_SYS_AMASK1_FINAL -CONFIG_SYS_AMASK2 -CONFIG_SYS_AMASK2_FINAL -CONFIG_SYS_AMASK3 -CONFIG_SYS_AMASK4 -CONFIG_SYS_AMASK6 -CONFIG_SYS_AMASK7 -CONFIG_SYS_AT91_MAIN_CLOCK -CONFIG_SYS_AT91_PLLA -CONFIG_SYS_AT91_PLLB -CONFIG_SYS_AT91_SLOW_CLOCK CONFIG_SYS_BAUDRATE_TABLE -CONFIG_SYS_BMAN_CENA_BASE -CONFIG_SYS_BMAN_CENA_SIZE -CONFIG_SYS_BMAN_CINH_BASE -CONFIG_SYS_BMAN_CINH_SIZE -CONFIG_SYS_BMAN_MEM_BASE -CONFIG_SYS_BMAN_MEM_PHYS -CONFIG_SYS_BMAN_MEM_SIZE -CONFIG_SYS_BMAN_NUM_PORTALS -CONFIG_SYS_BMAN_SP_CENA_SIZE -CONFIG_SYS_BMAN_SP_CINH_SIZE -CONFIG_SYS_BMAN_SWP_ISDR_REG -CONFIG_SYS_BOOTMAPSZ -CONFIG_SYS_CACHE_ACR0 -CONFIG_SYS_CACHE_ACR1 -CONFIG_SYS_CACHE_ACR2 -CONFIG_SYS_CACHE_DCACR -CONFIG_SYS_CACHE_ICACR -CONFIG_SYS_CCSRBAR -CONFIG_SYS_CCSRBAR_PHYS -CONFIG_SYS_CCSRBAR_PHYS_HIGH -CONFIG_SYS_CCSRBAR_PHYS_LOW -CONFIG_SYS_CLK -CONFIG_SYS_CLKTL_CBCDR -CONFIG_SYS_CPLD_AMASK -CONFIG_SYS_CPLD_BASE -CONFIG_SYS_CPLD_BASE_PHYS -CONFIG_SYS_CPLD_CSOR -CONFIG_SYS_CPLD_CSPR -CONFIG_SYS_CPLD_CSPR_EXT -CONFIG_SYS_CPLD_FTIM0 -CONFIG_SYS_CPLD_FTIM1 -CONFIG_SYS_CPLD_FTIM2 -CONFIG_SYS_CPLD_FTIM3 -CONFIG_SYS_CPU_CLK -CONFIG_SYS_CS0_BASE -CONFIG_SYS_CS0_CTRL -CONFIG_SYS_CS0_FTIM0 -CONFIG_SYS_CS0_FTIM1 -CONFIG_SYS_CS0_FTIM2 -CONFIG_SYS_CS0_FTIM3 -CONFIG_SYS_CS0_MASK -CONFIG_SYS_CS1_BASE -CONFIG_SYS_CS1_CTRL -CONFIG_SYS_CS1_FTIM0 -CONFIG_SYS_CS1_FTIM1 -CONFIG_SYS_CS1_FTIM2 -CONFIG_SYS_CS1_FTIM3 -CONFIG_SYS_CS1_MASK -CONFIG_SYS_CS2_BASE -CONFIG_SYS_CS2_CTRL -CONFIG_SYS_CS2_FTIM0 -CONFIG_SYS_CS2_FTIM1 -CONFIG_SYS_CS2_FTIM2 -CONFIG_SYS_CS2_FTIM3 -CONFIG_SYS_CS2_MASK -CONFIG_SYS_CS3_BASE -CONFIG_SYS_CS3_CTRL -CONFIG_SYS_CS3_FTIM0 -CONFIG_SYS_CS3_FTIM1 -CONFIG_SYS_CS3_FTIM2 -CONFIG_SYS_CS3_FTIM3 -CONFIG_SYS_CS3_MASK -CONFIG_SYS_CS4_FTIM0 -CONFIG_SYS_CS4_FTIM1 -CONFIG_SYS_CS4_FTIM2 -CONFIG_SYS_CS4_FTIM3 -CONFIG_SYS_CS6_FTIM0 -CONFIG_SYS_CS6_FTIM1 -CONFIG_SYS_CS6_FTIM2 -CONFIG_SYS_CS6_FTIM3 -CONFIG_SYS_CS7_FTIM0 -CONFIG_SYS_CS7_FTIM1 -CONFIG_SYS_CS7_FTIM2 -CONFIG_SYS_CS7_FTIM3 -CONFIG_SYS_CSOR0 -CONFIG_SYS_CSOR1 -CONFIG_SYS_CSOR2 -CONFIG_SYS_CSOR3 -CONFIG_SYS_CSOR4 -CONFIG_SYS_CSOR6 -CONFIG_SYS_CSOR7 -CONFIG_SYS_CSPR0 -CONFIG_SYS_CSPR0_EXT -CONFIG_SYS_CSPR0_FINAL -CONFIG_SYS_CSPR1 -CONFIG_SYS_CSPR1_EXT -CONFIG_SYS_CSPR1_FINAL -CONFIG_SYS_CSPR2 -CONFIG_SYS_CSPR2_EXT -CONFIG_SYS_CSPR2_FINAL -CONFIG_SYS_CSPR3 -CONFIG_SYS_CSPR3_EXT -CONFIG_SYS_CSPR3_FINAL -CONFIG_SYS_CSPR4 -CONFIG_SYS_CSPR4_EXT -CONFIG_SYS_CSPR6 -CONFIG_SYS_CSPR6_EXT -CONFIG_SYS_CSPR7 -CONFIG_SYS_CSPR7_EXT -CONFIG_SYS_DA850_DDR2_DDRPHYCR -CONFIG_SYS_DA850_DDR2_PBBPR -CONFIG_SYS_DA850_DDR2_SDBCR -CONFIG_SYS_DA850_DDR2_SDBCR2 -CONFIG_SYS_DA850_DDR2_SDRCR -CONFIG_SYS_DA850_DDR2_SDTIMR -CONFIG_SYS_DA850_DDR2_SDTIMR2 -CONFIG_SYS_DA850_PLL0_PLLM -CONFIG_SYS_DA850_PLL1_PLLM -CONFIG_SYS_DA850_SYSCFG_SUSPSRC -CONFIG_SYS_DCACHE_INV -CONFIG_SYS_DCSRBAR -CONFIG_SYS_DCSRBAR_PHYS -CONFIG_SYS_DCSR_DCFG_ADDR -CONFIG_SYS_DCSR_DCFG_OFFSET -CONFIG_SYS_DDRCDR -CONFIG_SYS_DDRCDR_VALUE -CONFIG_SYS_DDRUA -CONFIG_SYS_DDR_BLOCK1_SIZE -CONFIG_SYS_DDR_BLOCK2_BASE -CONFIG_SYS_DDR_CLKSEL -CONFIG_SYS_DDR_CLK_CNTL -CONFIG_SYS_DDR_CLK_CONTROL -CONFIG_SYS_DDR_CLK_CTRL -CONFIG_SYS_DDR_CONFIG -CONFIG_SYS_DDR_CONFIG_2 -CONFIG_SYS_DDR_CONTROL -CONFIG_SYS_DDR_CONTROL_2 -CONFIG_SYS_DDR_CS0_BNDS -CONFIG_SYS_DDR_CS0_CONFIG -CONFIG_SYS_DDR_CS0_CONFIG_2 -CONFIG_SYS_DDR_CS1_BNDS -CONFIG_SYS_DDR_CS1_CONFIG -CONFIG_SYS_DDR_CS1_CONFIG_2 -CONFIG_SYS_DDR_INIT_ADDR -CONFIG_SYS_DDR_INIT_EXT_ADDR -CONFIG_SYS_DDR_INTERVAL -CONFIG_SYS_DDR_MODE -CONFIG_SYS_DDR_MODE2 -CONFIG_SYS_DDR_MODE_1 -CONFIG_SYS_DDR_MODE_2 -CONFIG_SYS_DDR_MODE_CONTROL -CONFIG_SYS_DDR_RCW_1 -CONFIG_SYS_DDR_RCW_2 -CONFIG_SYS_DDR_SDRAM_BASE -CONFIG_SYS_DDR_SDRAM_CFG -CONFIG_SYS_DDR_SDRAM_CFG2 -CONFIG_SYS_DDR_SDRAM_CLK_CNTL -CONFIG_SYS_DDR_SR_CNTR -CONFIG_SYS_DDR_TIMING_0 -CONFIG_SYS_DDR_TIMING_1 -CONFIG_SYS_DDR_TIMING_2 -CONFIG_SYS_DDR_TIMING_3 -CONFIG_SYS_DDR_TIMING_4 -CONFIG_SYS_DDR_TIMING_5 -CONFIG_SYS_DDR_WRLVL_CONTROL -CONFIG_SYS_DDR_ZQ_CONTROL -CONFIG_SYS_DIALOG_PMIC_I2C_ADDR -CONFIG_SYS_DPAA_DCE -CONFIG_SYS_DPAA_FMAN -CONFIG_SYS_DPAA_PME -CONFIG_SYS_DPAA_RMAN -CONFIG_SYS_DRAM_TEST -CONFIG_SYS_DV_NOR_BOOT_CFG -CONFIG_SYS_ENV_SECT_SIZE -CONFIG_SYS_ETHOC_BASE -CONFIG_SYS_ETHOC_BUFFER_ADDR -CONFIG_SYS_EXCEPTION_VECTORS_HIGH -CONFIG_SYS_FAST_CLK -CONFIG_SYS_FEC_BUF_USE_SRAM -CONFIG_SYS_FLASH0 -CONFIG_SYS_FLASH1 -CONFIG_SYS_FLASH1_BASE_PHYS -CONFIG_SYS_FLASH1_BASE_PHYS_EARLY -CONFIG_SYS_FLASH_BANKS_LIST -CONFIG_SYS_FLASH_BANKS_SIZES -CONFIG_SYS_FLASH_BASE -CONFIG_SYS_FLASH_BASE_PHYS -CONFIG_SYS_FLASH_BASE_PHYS_EARLY -CONFIG_SYS_FLASH_PARMSECT_SZ -CONFIG_SYS_FLASH_SIZE -CONFIG_SYS_FM1_10GEC1_PHY_ADDR -CONFIG_SYS_FM1_CLK -CONFIG_SYS_FM1_DTSEC1_PHY_ADDR -CONFIG_SYS_FM1_DTSEC1_RISER_PHY_ADDR -CONFIG_SYS_FM1_DTSEC2_PHY_ADDR -CONFIG_SYS_FM1_DTSEC2_RISER_PHY_ADDR -CONFIG_SYS_FM1_DTSEC3_PHY_ADDR -CONFIG_SYS_FM1_DTSEC3_RISER_PHY_ADDR -CONFIG_SYS_FM1_DTSEC4_PHY_ADDR -CONFIG_SYS_FM1_DTSEC4_RISER_PHY_ADDR -CONFIG_SYS_FM1_DTSEC5_PHY_ADDR -CONFIG_SYS_FM1_QSGMII11_PHY_ADDR -CONFIG_SYS_FM1_QSGMII21_PHY_ADDR -CONFIG_SYS_FM2_CLK -CONFIG_SYS_FM_MURAM_SIZE -CONFIG_SYS_FPGAREG_DIPSW -CONFIG_SYS_FPGAREG_FREQ -CONFIG_SYS_FPGAREG_RESET -CONFIG_SYS_FPGAREG_RESET_CODE -CONFIG_SYS_FPGA_AMASK -CONFIG_SYS_FPGA_BASE -CONFIG_SYS_FPGA_CSOR -CONFIG_SYS_FPGA_CSPR -CONFIG_SYS_FPGA_CSPR_EXT -CONFIG_SYS_FPGA_FTIM0 -CONFIG_SYS_FPGA_FTIM1 -CONFIG_SYS_FPGA_FTIM2 -CONFIG_SYS_FPGA_FTIM3 -CONFIG_SYS_FPGA_SIZE -CONFIG_SYS_FPGA_WAIT -CONFIG_SYS_GPIO1_EN -CONFIG_SYS_GPIO1_FUNC -CONFIG_SYS_GPIO1_LED -CONFIG_SYS_GPIO1_OUT -CONFIG_SYS_GPIO_EN -CONFIG_SYS_GPIO_FUNC -CONFIG_SYS_GPIO_OUT -CONFIG_SYS_GPR1 -CONFIG_SYS_HZ_CLOCK -CONFIG_SYS_I2C_BUSES -CONFIG_SYS_I2C_EXPANDER_ADDR -CONFIG_SYS_I2C_FPGA_ADDR -CONFIG_SYS_I2C_G762_ADDR -CONFIG_SYS_I2C_IFDR_DIV -CONFIG_SYS_I2C_MAX_HOPS -CONFIG_SYS_I2C_NOPROBES -CONFIG_SYS_I2C_PCA953X_ADDR -CONFIG_SYS_I2C_PCA953X_WIDTH -CONFIG_SYS_I2C_PCA9557_ADDR -CONFIG_SYS_I2C_PINMUX_CLR -CONFIG_SYS_I2C_PINMUX_REG -CONFIG_SYS_I2C_PINMUX_SET -CONFIG_SYS_I2C_RTC_ADDR -CONFIG_SYS_I2C_TCA642X_ADDR -CONFIG_SYS_I2C_TCA642X_BUS_NUM -CONFIG_SYS_ICACHE_INV -CONFIG_SYS_IFC_ADDR -CONFIG_SYS_IFC_CCR -CONFIG_SYS_INIT_DBCR -CONFIG_SYS_INIT_L2CSR0 -CONFIG_SYS_INIT_L2_ADDR -CONFIG_SYS_INIT_L2_ADDR_PHYS -CONFIG_SYS_INIT_L2_END -CONFIG_SYS_INIT_L3_ADDR -CONFIG_SYS_INIT_L3_ADDR_PHYS -CONFIG_SYS_INIT_L3_VADDR -CONFIG_SYS_INIT_RAM_ADDR -CONFIG_SYS_INIT_RAM_ADDR_PHYS -CONFIG_SYS_INIT_RAM_ADDR_PHYS_HIGH -CONFIG_SYS_INIT_RAM_ADDR_PHYS_LOW -CONFIG_SYS_INIT_RAM_CTRL -CONFIG_SYS_INIT_RAM_SIZE -CONFIG_SYS_INIT_SP_OFFSET -CONFIG_SYS_INT_FLASH_BASE -CONFIG_SYS_INT_FLASH_ENABLE -CONFIG_SYS_IO_BASE -CONFIG_SYS_KMBEC_FPGA_BASE -CONFIG_SYS_KMBEC_FPGA_SIZE -CONFIG_SYS_LATCH_ADDR -CONFIG_SYS_LBC_ADDR -CONFIG_SYS_LBC_FLASH_BASE -CONFIG_SYS_LBC_LBCR -CONFIG_SYS_LBC_LCRR -CONFIG_SYS_LBC_LSDMR_COMMON -CONFIG_SYS_LBC_LSRT -CONFIG_SYS_LBC_MRTPR -CONFIG_SYS_LBC_SDRAM_BASE -CONFIG_SYS_LBC_SDRAM_BASE_PHYS -CONFIG_SYS_LBC_SDRAM_SIZE -CONFIG_SYS_LDB_CLOCK -CONFIG_SYS_LIME_BASE -CONFIG_SYS_LOW -CONFIG_SYS_LOWMEM_BASE -CONFIG_SYS_LPAE_SDRAM_BASE -CONFIG_SYS_LS_MC_AIOP_IMG_MAX_LENGTH -CONFIG_SYS_LS_MC_BOOT_TIMEOUT_MS -CONFIG_SYS_LS_MC_DPC_MAX_LENGTH -CONFIG_SYS_LS_MC_DPL_MAX_LENGTH -CONFIG_SYS_LS_MC_DRAM_AIOP_IMG_OFFSET -CONFIG_SYS_LS_MC_DRAM_BLOCK_MIN_SIZE -CONFIG_SYS_LS_MC_DRAM_DPC_OFFSET -CONFIG_SYS_LS_MC_DRAM_DPL_OFFSET -CONFIG_SYS_MAIN_PWR_ON -CONFIG_SYS_MASTER_CLOCK -CONFIG_SYS_MATRIX_EBI0CSA_VAL -CONFIG_SYS_MATRIX_EBICSA_VAL -CONFIG_SYS_MAX_I2C_BUS -CONFIG_SYS_MAX_NAND_CHIPS -CONFIG_SYS_MBAR -CONFIG_SYS_MBAR2 -CONFIG_SYS_MCKR -CONFIG_SYS_MCKR1_VAL -CONFIG_SYS_MCKR2_VAL -CONFIG_SYS_MCKR_CSS -CONFIG_SYS_MDIO1_OFFSET -CONFIG_SYS_MEMORY_BASE -CONFIG_SYS_MEM_RESERVE_SECURE -CONFIG_SYS_MFD -CONFIG_SYS_MMC_CD_PIN -CONFIG_SYS_MMC_CLK_OD -CONFIG_SYS_MMC_U_BOOT_DST -CONFIG_SYS_MMC_U_BOOT_OFFS -CONFIG_SYS_MMC_U_BOOT_SIZE -CONFIG_SYS_MMC_U_BOOT_START -CONFIG_SYS_MOR_VAL -CONFIG_SYS_MRAM_BASE -CONFIG_SYS_NAND_AMASK -CONFIG_SYS_NAND_BASE -CONFIG_SYS_NAND_BASE2 -CONFIG_SYS_NAND_BASE_LIST -CONFIG_SYS_NAND_BASE_PHYS -CONFIG_SYS_NAND_BR_PRELIM -CONFIG_SYS_NAND_CS -CONFIG_SYS_NAND_CSOR -CONFIG_SYS_NAND_CSPR -CONFIG_SYS_NAND_CSPR_EXT -CONFIG_SYS_NAND_DATA_BASE -CONFIG_SYS_NAND_DBW_8 -CONFIG_SYS_NAND_DDR_LAW -CONFIG_SYS_NAND_ECCBYTES -CONFIG_SYS_NAND_ECCPOS -CONFIG_SYS_NAND_ECCSIZE -CONFIG_SYS_NAND_ECCSTEPS -CONFIG_SYS_NAND_ECCTOTAL -CONFIG_SYS_NAND_ECC_BASE -CONFIG_SYS_NAND_ENABLE_PIN -CONFIG_SYS_NAND_ENABLE_PIN_SPL -CONFIG_SYS_NAND_FTIM0 -CONFIG_SYS_NAND_FTIM1 -CONFIG_SYS_NAND_FTIM2 -CONFIG_SYS_NAND_FTIM3 -CONFIG_SYS_NAND_HW_ECC -CONFIG_SYS_NAND_HW_ECC_OOBFIRST -CONFIG_SYS_NAND_LARGEPAGE -CONFIG_SYS_NAND_MASK_ALE -CONFIG_SYS_NAND_MASK_CLE -CONFIG_SYS_NAND_MAX_ECCPOS -CONFIG_SYS_NAND_MAX_OOBFREE -CONFIG_SYS_NAND_MX7_GPMI_62_ECC_BYTES -CONFIG_SYS_NAND_NO_SUBPAGE_WRITE -CONFIG_SYS_NAND_OR_PRELIM -CONFIG_SYS_NAND_PAGE_2K -CONFIG_SYS_NAND_PAGE_4K -CONFIG_SYS_NAND_READY_PIN -CONFIG_SYS_NAND_REGS_BASE -CONFIG_SYS_NAND_SIZE -CONFIG_SYS_NAND_U_BOOT_DST -CONFIG_SYS_NAND_U_BOOT_RELOC_SP -CONFIG_SYS_NAND_U_BOOT_SIZE -CONFIG_SYS_NAND_U_BOOT_START -CONFIG_SYS_NOR0_CSPR -CONFIG_SYS_NOR0_CSPR_EARLY -CONFIG_SYS_NOR0_CSPR_EXT -CONFIG_SYS_NOR1_CSPR -CONFIG_SYS_NOR1_CSPR_EARLY -CONFIG_SYS_NOR1_CSPR_EXT -CONFIG_SYS_NOR_AMASK -CONFIG_SYS_NOR_AMASK_EARLY -CONFIG_SYS_NOR_CSOR -CONFIG_SYS_NOR_CSPR -CONFIG_SYS_NOR_CSPR_EXT -CONFIG_SYS_NOR_FTIM0 -CONFIG_SYS_NOR_FTIM1 -CONFIG_SYS_NOR_FTIM2 -CONFIG_SYS_NOR_FTIM3 -CONFIG_SYS_NS16550_CLK -CONFIG_SYS_NS16550_COM1 -CONFIG_SYS_NS16550_COM2 -CONFIG_SYS_NS16550_COM3 -CONFIG_SYS_NS16550_COM4 -CONFIG_SYS_NS16550_COM5 -CONFIG_SYS_NS16550_COM6 -CONFIG_SYS_NS16550_MEM32 -CONFIG_SYS_NS16550_PORT_MAPPED -CONFIG_SYS_NS16550_REG_SIZE -CONFIG_SYS_NS16550_SERIAL -CONFIG_SYS_NUM_CPC -CONFIG_SYS_NUM_FM1_10GEC -CONFIG_SYS_NUM_FM1_DTSEC -CONFIG_SYS_NUM_FM2_10GEC -CONFIG_SYS_NUM_FM2_DTSEC -CONFIG_SYS_NUM_FMAN -CONFIG_SYS_NUM_I2C_BUSES -CONFIG_SYS_NVRAM_BASE_ADDR -CONFIG_SYS_NVRAM_SIZE -CONFIG_SYS_OBIR -CONFIG_SYS_OMAP_ABE_SYSCK -CONFIG_SYS_ONENAND_BASE -CONFIG_SYS_ONENAND_BLOCK_SIZE -CONFIG_SYS_OSCIN_FREQ -CONFIG_SYS_OSPR_OFFSET -CONFIG_SYS_PACNT -CONFIG_SYS_PADAT -CONFIG_SYS_PADDR -CONFIG_SYS_PAGE_SIZE -CONFIG_SYS_PAMU_ADDR -CONFIG_SYS_PASPAR -CONFIG_SYS_PAXE_BASE -CONFIG_SYS_PAXE_SIZE -CONFIG_SYS_PBCNT -CONFIG_SYS_PBDAT -CONFIG_SYS_PBDDR -CONFIG_SYS_PBI_FLASH_BASE -CONFIG_SYS_PBI_FLASH_WINDOW -CONFIG_SYS_PCCNT -CONFIG_SYS_PCDAT -CONFIG_SYS_PCDDR -CONFIG_SYS_PCI -CONFIG_SYS_PCI1_ADDR -CONFIG_SYS_PCI1_IO_BASE -CONFIG_SYS_PCI1_IO_BUS -CONFIG_SYS_PCI1_IO_PHYS -CONFIG_SYS_PCI1_IO_SIZE -CONFIG_SYS_PCI1_IO_VIRT -CONFIG_SYS_PCI1_MEM_BASE -CONFIG_SYS_PCI1_MEM_BUS -CONFIG_SYS_PCI1_MEM_PHYS -CONFIG_SYS_PCI1_MEM_SIZE -CONFIG_SYS_PCI1_MEM_VIRT -CONFIG_SYS_PCI2_ADDR -CONFIG_SYS_PCIE -CONFIG_SYS_PCIE1_ADDR -CONFIG_SYS_PCIE1_CFG_BASE -CONFIG_SYS_PCIE1_CFG_SIZE -CONFIG_SYS_PCIE1_IO_PHYS -CONFIG_SYS_PCIE1_IO_VIRT -CONFIG_SYS_PCIE1_MEM_PHYS -CONFIG_SYS_PCIE1_MEM_VIRT -CONFIG_SYS_PCIE1_PHYS_ADDR -CONFIG_SYS_PCIE1_PHYS_BASE -CONFIG_SYS_PCIE1_VIRT_ADDR -CONFIG_SYS_PCIE2_ADDR -CONFIG_SYS_PCIE2_CFG_BASE -CONFIG_SYS_PCIE2_CFG_SIZE -CONFIG_SYS_PCIE2_IO_PHYS -CONFIG_SYS_PCIE2_IO_VIRT -CONFIG_SYS_PCIE2_MEM_PHYS -CONFIG_SYS_PCIE2_MEM_VIRT -CONFIG_SYS_PCIE2_PHYS_ADDR -CONFIG_SYS_PCIE2_PHYS_BASE -CONFIG_SYS_PCIE2_VIRT_ADDR -CONFIG_SYS_PCIE3_ADDR -CONFIG_SYS_PCIE3_IO_PHYS -CONFIG_SYS_PCIE3_IO_VIRT -CONFIG_SYS_PCIE3_MEM_PHYS -CONFIG_SYS_PCIE3_MEM_VIRT -CONFIG_SYS_PCIE3_PHYS_ADDR -CONFIG_SYS_PCIE3_PHYS_SIZE -CONFIG_SYS_PCIE4_ADDR -CONFIG_SYS_PCIE4_IO_PHYS -CONFIG_SYS_PCIE4_IO_VIRT -CONFIG_SYS_PCIE4_MEM_BUS -CONFIG_SYS_PCIE4_MEM_PHYS -CONFIG_SYS_PCIE4_MEM_VIRT -CONFIG_SYS_PCIE4_PHYS_ADDR -CONFIG_SYS_PCIE_MMAP_SIZE -CONFIG_SYS_PDCNT -CONFIG_SYS_PEHLPAR -CONFIG_SYS_PIOC_PDR_VAL -CONFIG_SYS_PIOC_PDR_VAL1 -CONFIG_SYS_PIOC_PPUDR_VAL -CONFIG_SYS_PIOD_PDR_VAL1 -CONFIG_SYS_PIOD_PPUDR_VAL -CONFIG_SYS_PJPAR -CONFIG_SYS_PL310_BASE -CONFIG_SYS_PLLAR_VAL -CONFIG_SYS_PLLCR -CONFIG_SYS_PLL_BYPASS -CONFIG_SYS_PLL_FDR -CONFIG_SYS_PLL_ODR -CONFIG_SYS_PLL_SETTLING_TIME -CONFIG_SYS_PMAN -CONFIG_SYS_PME_CLK -CONFIG_SYS_POST_MEMORY -CONFIG_SYS_POST_MEM_REGIONS -CONFIG_SYS_PUAPAR -CONFIG_SYS_QMAN_CENA_BASE -CONFIG_SYS_QMAN_CENA_SIZE -CONFIG_SYS_QMAN_CINH_BASE -CONFIG_SYS_QMAN_CINH_SIZE -CONFIG_SYS_QMAN_MEM_BASE -CONFIG_SYS_QMAN_MEM_PHYS -CONFIG_SYS_QMAN_MEM_SIZE -CONFIG_SYS_QMAN_NUM_PORTALS -CONFIG_SYS_QMAN_SP_CENA_SIZE -CONFIG_SYS_QMAN_SP_CINH_SIZE -CONFIG_SYS_QMAN_SWP_ISDR_REG -CONFIG_SYS_QRIO_BASE -CONFIG_SYS_QRIO_BASE_PHYS -CONFIG_SYS_RCAR_I2C0_BASE -CONFIG_SYS_RCAR_I2C1_BASE -CONFIG_SYS_RCAR_I2C2_BASE -CONFIG_SYS_RCAR_I2C3_BASE -CONFIG_SYS_RFD -CONFIG_SYS_RGMII1_PHY_ADDR -CONFIG_SYS_RGMII2_PHY_ADDR -CONFIG_SYS_ROM_BASE -CONFIG_SYS_RSTC_RMR_VAL -CONFIG_SYS_RTC_BUS_NUM -CONFIG_SYS_RTC_CNT -CONFIG_SYS_RTC_SETUP -CONFIG_SYS_SATA -CONFIG_SYS_SATA_FAT_BOOT_PARTITION -CONFIG_SYS_SBFHDR_DATA_OFFSET -CONFIG_SYS_SBFHDR_SIZE -CONFIG_SYS_SCCR_SATACM -CONFIG_SYS_SCCR_TSEC1CM -CONFIG_SYS_SCCR_TSEC2CM -CONFIG_SYS_SCCR_USBDRCM -CONFIG_SYS_SCR -CONFIG_SYS_SDRAM -CONFIG_SYS_SDRAM_BASE -CONFIG_SYS_SDRAM_BASE0 -CONFIG_SYS_SDRAM_BASE1 -CONFIG_SYS_SDRAM_BASE2 -CONFIG_SYS_SDRAM_CFG1 -CONFIG_SYS_SDRAM_CFG2 -CONFIG_SYS_SDRAM_CTRL -CONFIG_SYS_SDRAM_EMOD -CONFIG_SYS_SDRAM_MODE -CONFIG_SYS_SDRAM_SIZE -CONFIG_SYS_SDRAM_SIZE0 -CONFIG_SYS_SDRAM_SIZE_LAW -CONFIG_SYS_SDRAM_VAL -CONFIG_SYS_SDRAM_VAL1 -CONFIG_SYS_SDRAM_VAL10 -CONFIG_SYS_SDRAM_VAL11 -CONFIG_SYS_SDRAM_VAL12 -CONFIG_SYS_SDRAM_VAL2 -CONFIG_SYS_SDRAM_VAL3 -CONFIG_SYS_SDRAM_VAL4 -CONFIG_SYS_SDRAM_VAL5 -CONFIG_SYS_SDRAM_VAL6 -CONFIG_SYS_SDRAM_VAL7 -CONFIG_SYS_SDRAM_VAL8 -CONFIG_SYS_SDRAM_VAL9 -CONFIG_SYS_SDRC_CR_VAL -CONFIG_SYS_SDRC_MDR_VAL -CONFIG_SYS_SDRC_MR_VAL -CONFIG_SYS_SDRC_MR_VAL1 -CONFIG_SYS_SDRC_MR_VAL2 -CONFIG_SYS_SDRC_MR_VAL3 -CONFIG_SYS_SDRC_MR_VAL4 -CONFIG_SYS_SDRC_MR_VAL5 -CONFIG_SYS_SDRC_TR_VAL -CONFIG_SYS_SDRC_TR_VAL1 -CONFIG_SYS_SDRC_TR_VAL2 -CONFIG_SYS_SEC_MON_ADDR -CONFIG_SYS_SEC_MON_OFFSET -CONFIG_SYS_SERIAL0 -CONFIG_SYS_SERIAL1 -CONFIG_SYS_SERIAL2 -CONFIG_SYS_SERIAL3 -CONFIG_SYS_SFP_ADDR -CONFIG_SYS_SFP_OFFSET -CONFIG_SYS_SGMII1_PHY_ADDR -CONFIG_SYS_SGMII2_PHY_ADDR -CONFIG_SYS_SGMII3_PHY_ADDR -CONFIG_SYS_SGMII_LINERATE_MHZ -CONFIG_SYS_SGMII_RATESCALE -CONFIG_SYS_SGMII_REFCLK_MHZ -CONFIG_SYS_SH_SDHI0_BASE -CONFIG_SYS_SH_SDHI1_BASE -CONFIG_SYS_SH_SDHI2_BASE -CONFIG_SYS_SH_SDHI3_BASE -CONFIG_SYS_SH_SDHI_NR_CHANNEL -CONFIG_SYS_SICRH -CONFIG_SYS_SICRL -CONFIG_SYS_SMC0_CYCLE0_VAL -CONFIG_SYS_SMC0_MODE0_VAL -CONFIG_SYS_SMC0_PULSE0_VAL -CONFIG_SYS_SMC0_SETUP0_VAL -CONFIG_SYS_SPI_ARGS_OFFS -CONFIG_SYS_SPI_ARGS_SIZE -CONFIG_SYS_SPI_BASE -CONFIG_SYS_SPI_CLK -CONFIG_SYS_SPI_FLASH_U_BOOT_DST -CONFIG_SYS_SPI_FLASH_U_BOOT_OFFS -CONFIG_SYS_SPI_FLASH_U_BOOT_SIZE -CONFIG_SYS_SPI_FLASH_U_BOOT_START -CONFIG_SYS_SPI_KERNEL_OFFS -CONFIG_SYS_SPI_ST_ENABLE_WP_PIN -CONFIG_SYS_SPI_U_BOOT_SIZE -CONFIG_SYS_SPL_MALLOC_START -CONFIG_SYS_SPR -CONFIG_SYS_SRIO -CONFIG_SYS_SRIO1_MEM_PHYS -CONFIG_SYS_SRIO1_MEM_SIZE -CONFIG_SYS_SRIO1_MEM_VIRT -CONFIG_SYS_SRIO2_MEM_PHYS -CONFIG_SYS_SRIO2_MEM_SIZE -CONFIG_SYS_SRIO2_MEM_VIRT -CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR -CONFIG_SYS_SRIO_PCIE_BOOT_SLAVE_ADDR_PHYS -CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR -CONFIG_SYS_SRIO_PCIE_BOOT_UCODE_ENV_ADDR_PHYS -CONFIG_SYS_SST_SECT -CONFIG_SYS_SST_SECTSZ -CONFIG_SYS_STACK_SIZE -CONFIG_SYS_TBIPA_VALUE -CONFIG_SYS_TCLK -CONFIG_SYS_TIMERBASE -CONFIG_SYS_TIMER_BASE -CONFIG_SYS_TIMER_COUNTER -CONFIG_SYS_TIMER_COUNTS_DOWN -CONFIG_SYS_TIMER_RATE -CONFIG_SYS_TMPVIRT -CONFIG_SYS_TSEC1_OFFSET -CONFIG_SYS_TX_ETH_BUFFER -CONFIG_SYS_UART2_ALT3_GPIO -CONFIG_SYS_UART_PORT -CONFIG_SYS_UBOOT_BASE -CONFIG_SYS_UBOOT_START -CONFIG_SYS_UEC -CONFIG_SYS_UEC2_PHY_ADDR -CONFIG_SYS_USB_OHCI_REGS_BASE -CONFIG_SYS_VCXK_ACKNOWLEDGE_DDR -CONFIG_SYS_VCXK_ACKNOWLEDGE_PIN -CONFIG_SYS_VCXK_ACKNOWLEDGE_PORT -CONFIG_SYS_VCXK_BASE -CONFIG_SYS_VCXK_DEFAULT_LINEALIGN -CONFIG_SYS_VCXK_DOUBLEBUFFERED -CONFIG_SYS_VCXK_ENABLE_DDR -CONFIG_SYS_VCXK_ENABLE_PIN -CONFIG_SYS_VCXK_ENABLE_PORT -CONFIG_SYS_VCXK_INVERT_DDR -CONFIG_SYS_VCXK_INVERT_PIN -CONFIG_SYS_VCXK_INVERT_PORT -CONFIG_SYS_VCXK_REQUEST_DDR -CONFIG_SYS_VCXK_REQUEST_PIN -CONFIG_SYS_VCXK_REQUEST_PORT -CONFIG_SYS_VSC7385_BASE -CONFIG_SYS_VSC7385_BASE_PHYS -CONFIG_SYS_VSC7385_BR_PRELIM -CONFIG_SYS_VSC7385_OR_PRELIM -CONFIG_SYS_WATCHDOG_VALUE -CONFIG_SYS_WDTC_WDMR_VAL -CONFIG_SYS_WRITE_SWAPPED_DATA -CONFIG_SYS_XHCI_USB1_ADDR -CONFIG_SYS_XHCI_USB2_ADDR -CONFIG_SYS_XHCI_USB3_ADDR -CONFIG_TCA642X CONFIG_TEGRA_BOARD_STRING -CONFIG_TEGRA_CLOCK_SCALING CONFIG_TEGRA_ENABLE_UARTA CONFIG_TEGRA_ENABLE_UARTD -CONFIG_TEGRA_LP0 -CONFIG_TEGRA_PMU CONFIG_TEGRA_SLINK_CTRLS CONFIG_TEGRA_SPI CONFIG_TEGRA_UARTA_GPU @@ -964,9 +243,7 @@ CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 CONFIG_TESTPIN_MASK CONFIG_TESTPIN_REG CONFIG_THOR_RESET_OFF -CONFIG_TMU_TIMER CONFIG_TPM_TIS_BASE_ADDRESS -CONFIG_TPS6586X_POWER CONFIG_TSEC CONFIG_TSEC1 CONFIG_TSEC1_NAME @@ -979,7 +256,6 @@ CONFIG_TSEC4_NAME CONFIG_TSECV2 CONFIG_TSECV2_1 CONFIG_TSEC_TBICR_SETTINGS -CONFIG_TWL6030_POWER CONFIG_UBIFS_VOLUME CONFIG_UBI_PART CONFIG_UBOOTPATH @@ -990,25 +266,15 @@ CONFIG_UEC_ETH2 CONFIG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS -CONFIG_USBD_MANUFACTURER -CONFIG_USBD_PRODUCTID_CDCACM -CONFIG_USBD_PRODUCTID_GSERIAL -CONFIG_USBD_PRODUCT_NAME -CONFIG_USBD_VENDORID CONFIG_USB_BOOTING -CONFIG_USB_DEVICE CONFIG_USB_EXT2_BOOT CONFIG_USB_FAT_BOOT -CONFIG_USB_GADGET_AT91 CONFIG_USB_ISP1301_I2C_ADDR -CONFIG_USB_TTY CONFIG_U_BOOT_HDR_SIZE CONFIG_VAR_SIZE_SPL CONFIG_VERY_BIG_RAM -CONFIG_VSC7385_ENET CONFIG_VSC7385_IMAGE CONFIG_VSC7385_IMAGE_SIZE -CONFIG_VSC9953 CONFIG_WATCHDOG_PRESC CONFIG_WATCHDOG_RC CONFIG_WATCHDOG_TIMEOUT -- cgit v1.2.3 From 17f13e7119cc628bc26edf12252794770247df63 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sat, 19 Nov 2022 18:45:42 -0500 Subject: scripts/config_whitelist.txt: Remove more referenced symbols Perform some deeper investigation on the remaining symbols listed in this file and remove more. Signed-off-by: Tom Rini Reviewed-by: Simon Glass --- include/configs/P1010RDB.h | 2 -- scripts/config_whitelist.txt | 21 --------------------- 2 files changed, 23 deletions(-) (limited to 'scripts') diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index c0805f979b..b1d6b15811 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -173,8 +173,6 @@ extern unsigned long get_sdram_size(void); #define CFG_SYS_NAND_BASE_PHYS CFG_SYS_NAND_BASE #endif -#define CONFIG_MTD_PARTITION - #define CFG_SYS_NAND_CSPR (CSPR_PHYS_ADDR(CFG_SYS_NAND_BASE_PHYS) \ | CSPR_PORT_SIZE_8 \ | CSPR_MSEL_NAND \ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index ccc3a73197..12c23a5dfd 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -1,5 +1,4 @@ CONFIG_ARM_GIC_BASE_ADDRESS -CONFIG_AUTO_ZRELADDR CONFIG_BOARDDIR CONFIG_DFU_ALT CONFIG_DFU_ALT_BOOT_EMMC @@ -8,7 +7,6 @@ CONFIG_DFU_ALT_SYSTEM CONFIG_DFU_ENV_SETTINGS CONFIG_DM9000_BASE CONFIG_DM9000_BYTE_SWAPPED -CONFIG_DM9000_DEBUG CONFIG_DM9000_NO_SROM CONFIG_DM9000_USE_16BIT CONFIG_DW_WDT_CLOCK_KHZ @@ -49,8 +47,6 @@ CONFIG_FSL_PMIC_MODE CONFIG_FSL_SDHC_V2_3 CONFIG_FSL_SERDES1 CONFIG_FSL_SERDES2 -CONFIG_FTRTC010_EXTCLK -CONFIG_FTRTC010_PCLK CONFIG_GATEWAYIP CONFIG_GMII CONFIG_G_DNL_THOR_PRODUCT_NUM @@ -64,7 +60,6 @@ CONFIG_HW_ENV_SETTINGS CONFIG_I2C_ENV_EEPROM_BUS CONFIG_I2C_MULTI_BUS CONFIG_I2C_MVTWSI -CONFIG_I2C_MVTWSI_BASE CONFIG_I2C_MVTWSI_BASE0 CONFIG_I2C_MVTWSI_BASE1 CONFIG_I2C_RTC_ADDR @@ -136,12 +131,8 @@ CONFIG_MIU_2BIT_INTERLEAVED CONFIG_MMC_DEFAULT_DEV CONFIG_MMC_SUNXI_SLOT CONFIG_MONITOR_IS_IN_RAM -CONFIG_MPC85XX_FEC -CONFIG_MPC85XX_FEC_NAME CONFIG_MTD_NAND_VERIFY_WRITE -CONFIG_MTD_PARTITION CONFIG_MVGBE_PORTS -CONFIG_MVS CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC CONFIG_MXC_NAND_IP_REGS_BASE @@ -150,15 +141,10 @@ CONFIG_MXC_UART_BASE CONFIG_MXC_USB_FLAGS CONFIG_MXC_USB_PORT CONFIG_MXC_USB_PORTSC -CONFIG_MXS CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC CONFIG_NAND_CS_INIT -CONFIG_NAND_OMAP_GPMC_WSCFG -CONFIG_NAND_SECBOOT -CONFIG_NAND_SPL CONFIG_NETDEV CONFIG_NETMASK -CONFIG_NEVER_ASSERT_ODT_TO_CPU CONFIG_NORBOOT CONFIG_NUM_DSP_CPUS CONFIG_ODROID_REV_AIN @@ -174,12 +160,10 @@ CONFIG_PHY_INTERFACE_MODE CONFIG_PHY_IRAM_BASE CONFIG_PL011_CLOCK CONFIG_PL01x_PORTS -CONFIG_PM CONFIG_PME_PLAT_CLK_DIV CONFIG_POST CONFIG_POSTBOOTMENU CONFIG_POST_EXTERNAL_WORD_FUNCS -CONFIG_POST_SKIP_ENV_FLAGS CONFIG_POWER_LTC3676_I2C_ADDR CONFIG_POWER_PFUZE100_I2C_ADDR CONFIG_POWER_PFUZE3000_I2C_ADDR @@ -204,7 +188,6 @@ CONFIG_SCIF_A CONFIG_SCSI_DEV_LIST CONFIG_SC_TIMER_CLK CONFIG_SERIAL_BOOT -CONFIG_SERIAL_SOFTWARE_FIFO CONFIG_SERVERIP CONFIG_SETUP_INITRD_TAG CONFIG_SET_DFU_ALT_BUF_LEN @@ -213,14 +196,12 @@ CONFIG_SH_ETHER_CACHE_INVALIDATE CONFIG_SH_ETHER_CACHE_WRITEBACK CONFIG_SH_ETHER_PHY_ADDR CONFIG_SH_ETHER_PHY_MODE -CONFIG_SH_ETHER_SH7734_MII CONFIG_SH_ETHER_USE_PORT CONFIG_SH_QSPI_BASE CONFIG_SLIC CONFIG_SMDK5420 CONFIG_SMP_PEN_ADDR CONFIG_SOCRATES -CONFIG_SOFT_I2C_READ_REPEATED_START CONFIG_SPI_ADDR CONFIG_SPI_BOOTING CONFIG_SPI_FLASH_QUAD @@ -244,7 +225,6 @@ CONFIG_TESTPIN_MASK CONFIG_TESTPIN_REG CONFIG_THOR_RESET_OFF CONFIG_TPM_TIS_BASE_ADDRESS -CONFIG_TSEC CONFIG_TSEC1 CONFIG_TSEC1_NAME CONFIG_TSEC2 @@ -262,7 +242,6 @@ CONFIG_UBOOTPATH CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START CONFIG_UEC_ETH -CONFIG_UEC_ETH2 CONFIG_USART_BASE CONFIG_USART_ID CONFIG_USBD_HS -- cgit v1.2.3 From 1e1c51f8ace8717f972ccad37616e3b6488e92ad Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Wed, 7 Dec 2022 15:49:43 -0500 Subject: Makefile: link with --no-warn-rwx-segments We borrow from the Linux Kernel 0d362be5b142 ("Makefile: link with -z noexecstack --no-warn-rwx-segments") here to disable the RWX segment linking warnings. We do not also bring in -z noexecstack as that requires auditing and using ".note.GNU-stack" on assembly functions which do need this feature. Further, we now introduce KBUILD_EFILDFLAGS so that we can also pass --no-warn-rwx-segments when linking EFI applications, and those do explicitly pass -z execstack. Cc: Heinrich Schuchardt Cc: Ilias Apalodimas Signed-off-by: Tom Rini Reviewed-by: Nick Desaulniers Reviewed-by: Ilias Apalodimas --- Makefile | 2 ++ scripts/Makefile.lib | 6 ++++-- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'scripts') diff --git a/Makefile b/Makefile index 9ec2e12a06..9d84f96481 100644 --- a/Makefile +++ b/Makefile @@ -806,6 +806,8 @@ KBUILD_CPPFLAGS += $(KCPPFLAGS) KBUILD_AFLAGS += $(KAFLAGS) KBUILD_CFLAGS += $(KCFLAGS) +KBUILD_LDFLAGS += $(call ld-option,--no-warn-rwx-segments) + KBUILD_HOSTCFLAGS += $(if $(CONFIG_TOOLS_DEBUG),-g) # Use UBOOTINCLUDE when you must reference the include/ directory. diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib index 8e13bf2b98..ac45a88478 100644 --- a/scripts/Makefile.lib +++ b/scripts/Makefile.lib @@ -425,9 +425,11 @@ cmd_efi_objcopy = $(OBJCOPY) -j .header -j .text -j .sdata -j .data -j \ $(obj)/%.efi: $(obj)/%_efi.so $(call cmd,efi_objcopy) +KBUILD_EFILDFLAGS = -nostdlib -zexecstack -znocombreloc -znorelro +KBUILD_EFILDFLAGS += $(call ld-option,--no-warn-rwx-segments) quiet_cmd_efi_ld = LD $@ -cmd_efi_ld = $(LD) -nostdlib -zexecstack -znocombreloc -T $(EFI_LDS_PATH) \ - -shared -Bsymbolic -znorelro -s $^ -o $@ +cmd_efi_ld = $(LD) $(KBUILD_EFILDFLAGS) -T $(EFI_LDS_PATH) \ + -shared -Bsymbolic -s $^ -o $@ EFI_LDS_PATH = $(srctree)/arch/$(ARCH)/lib/$(EFI_LDS) -- cgit v1.2.3 From 6f7c936fbdd40071716730d07083c7f596700478 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Fri, 2 Dec 2022 18:22:39 +0100 Subject: board/km/cent2: migrate to environment text file Use like the other boards a text file for the environment. As this is the last user of keymile-common.h we can now remove this file completely. Signed-off-by: Holger Brunck --- board/keymile/Kconfig | 12 --- board/keymile/kmcent2/kmcent2.c | 2 +- board/keymile/kmcent2/kmcent2.env | 37 ++++++++ configs/kmcent2_defconfig | 2 +- include/configs/km/keymile-common.h | 174 ------------------------------------ include/configs/kmcent2.h | 74 --------------- scripts/config_whitelist.txt | 15 ---- 7 files changed, 39 insertions(+), 277 deletions(-) create mode 100644 board/keymile/kmcent2/kmcent2.env delete mode 100644 include/configs/km/keymile-common.h (limited to 'scripts') diff --git a/board/keymile/Kconfig b/board/keymile/Kconfig index b8f0578a28..46d0897108 100644 --- a/board/keymile/Kconfig +++ b/board/keymile/Kconfig @@ -77,18 +77,6 @@ config SYS_CLIPS_BASE help IFC Base Address for CLIPS FPGA. -config KM_CONSOLE_TTY - string "KM Console" - default "ttyS0" - help - TTY console to use on board. - -config KM_DEF_NETDEV - string "Default Netdevice" - default "eth0" - help - Default netdevice for debug interface - config KM_COMMON_ETH_INIT bool "Common Ethernet Initialization" default y if ARCH_KIRKWOOD || MPC83xx diff --git a/board/keymile/kmcent2/kmcent2.c b/board/keymile/kmcent2/kmcent2.c index 9f68c215f3..ed552c57b5 100644 --- a/board/keymile/kmcent2/kmcent2.c +++ b/board/keymile/kmcent2/kmcent2.c @@ -34,7 +34,7 @@ static uchar ivm_content[CONFIG_SYS_IVM_EEPROM_MAX_LEN]; int checkboard(void) { - printf("Board: Hitachi Power Grids %s\n", KM_BOARD_NAME); + printf("Board: Hitachi Power Grids kmcent2\n"); return 0; } diff --git a/board/keymile/kmcent2/kmcent2.env b/board/keymile/kmcent2/kmcent2.env new file mode 100644 index 0000000000..7c8f8306c5 --- /dev/null +++ b/board/keymile/kmcent2/kmcent2.env @@ -0,0 +1,37 @@ +#include + +EEprom_ivm=pca9547:70:9 +arch=ppc_82xx +boot=bootm ${load_addr_r} - ${fdt_addr_r} +checkfdt=true +cramfsloadfdt=cramfsload ${fdt_addr_r} fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb +fpgacfg=true +hostname=kmcent2 +hwconfig=fsl_ddr:ctlr_intlv=cacheline +netdev=eth2 + +newenv=protect off ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE && + erase ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE && + protect on ENV_DEL_ADDR +CONFIG_ENV_TOTAL_SIZE + +set_fdthigh=true +uimage=uImage + +update=protect off CONFIG_SYS_MONITOR_BASE +${filesize} && + erase CONFIG_SYS_MONITOR_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_MONITOR_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +${filesize} + update-nor=protect off CONFIG_SYS_FLASH_BASE +${filesize} && + erase CONFIG_SYS_FLASH_BASE +${filesize} && + cp.b ${load_addr_r} CONFIG_SYS_FLASH_BASE ${filesize} && + protect on CONFIG_SYS_MONITOR_BASE +CONFIG_SYS_MONITOR_LEN + +usb_phy_type=utmi +usb_dr_mode=host + +/* + * The Linux fsl_fman driver needs to be able to process frames with more + * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot + * parameters + */ +add_default+= fsl_dpaa_fman.fsl_fm_max_frm=1558 diff --git a/configs/kmcent2_defconfig b/configs/kmcent2_defconfig index 41b26287d5..2abda78893 100644 --- a/configs/kmcent2_defconfig +++ b/configs/kmcent2_defconfig @@ -17,7 +17,6 @@ CONFIG_SYS_CACHE_STASHING=y # CONFIG_DEEP_SLEEP is not set CONFIG_PCIE1=y CONFIG_SYS_FSL_NUM_CC_PLLS=2 -CONFIG_KM_DEF_NETDEV="eth2" CONFIG_KM_IVM_BUS=2 CONFIG_SYS_MONITOR_LEN=786432 CONFIG_MP=y @@ -54,6 +53,7 @@ CONFIG_MTDPARTS_DEFAULT="mtdparts=fe8000000.nor:128k(RCW),128k(fman),128k(QE),12 CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set CONFIG_OF_CONTROL=y +CONFIG_ENV_SOURCE_FILE="kmcent2" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_FLASH=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/km/keymile-common.h b/include/configs/km/keymile-common.h deleted file mode 100644 index cc5ec219b8..0000000000 --- a/include/configs/km/keymile-common.h +++ /dev/null @@ -1,174 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2008-2011 - * Heiko Schocher, DENX Software Engineering, hs@denx.de. - */ - -#ifndef __CONFIG_KEYMILE_H -#define __CONFIG_KEYMILE_H - -#include - -/* - * Miscellaneous configurable options - */ - -#define CFG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } - -#ifndef CONFIG_KM_DEF_ENV_BOOTPARAMS -#define CONFIG_KM_DEF_ENV_BOOTPARAMS \ - "actual_bank=0\0" -#endif - -#ifndef CONFIG_KM_UBI_PARTITION_NAME_BOOT -#define CONFIG_KM_UBI_PARTITION_NAME_BOOT "ubi0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_BOOT */ - -#ifndef CONFIG_KM_UBI_PART_BOOT_OPTS -#define CONFIG_KM_UBI_PART_BOOT_OPTS "" -#endif /* CONFIG_KM_UBI_PART_BOOT_OPTS */ - -#ifndef CONFIG_KM_UBI_PARTITION_NAME_APP -/* one flash chip only called boot */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -# define CONFIG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "\0" -#else /* CONFIG_KM_UBI_PARTITION_NAME_APP */ -/* two flash chips called boot and app */ -/* boot: CONFIG_KM_UBI_PARTITION_NAME_BOOT */ -/* app: CONFIG_KM_UBI_PARTITION_NAME_APP */ -# define CONFIG_KM_UBI_LINUX_MTD \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_BOOT \ - CONFIG_KM_UBI_PART_BOOT_OPTS " " \ - "ubi.mtd=" CONFIG_KM_UBI_PARTITION_NAME_APP -# define CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI \ - "ubiattach=if test ${boot_bank} -eq 0; then; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_BOOT "; else; " \ - "ubi part " CONFIG_KM_UBI_PARTITION_NAME_APP "; fi\0" -#endif /* CONFIG_KM_UBI_PARTITION_NAME_APP */ - -#ifdef CONFIG_NAND_ECC_BCH -#define CONFIG_KM_UIMAGE_NAME "ecc_bch_uImage\0" -#define CONFIG_KM_ECC_MODE " eccmode=bch" -#else -#define CONFIG_KM_UIMAGE_NAME "uImage\0" -#define CONFIG_KM_ECC_MODE -#endif - -/* - * boottargets - * - set 'subbootcmds' - * - set 'bootcmd' and 'altbootcmd' - * available targets: - * - 'release': for a standalone system kernel/rootfs from flash - */ -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ - "subbootcmds=ubiattach ubicopy checkfdt cramfsloadfdt " \ - "set_fdthigh cramfsloadkernel flashargs add_default " \ - "addpanic boot\0" \ - "develop=" \ - "tftp ${load_addr_r} scripts/develop-${arch}.txt && " \ - "env import -t ${load_addr_r} ${filesize} && " \ - "run setup_debug_env\0" \ - "ramfs=" \ - "tftp ${load_addr_r} scripts/ramfs-${arch}.txt && " \ - "env import -t ${load_addr_r} ${filesize} && " \ - "run setup_debug_env\0" \ - "" - -/* - * bootargs - * - modify 'bootargs' - * - * - 'add_default': default bootargs common for all arm/ppc boards - * - 'addpanic': add kernel panic options - * - 'flashargs': defaults arguments for flash base boot - * - */ -#define CONFIG_KM_DEF_ENV_BOOTARGS \ - "add_default=" \ - "setenv bootargs ${bootargs} " \ - "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ - ":${hostname}:${netdev}:off:" \ - " console=" CONFIG_KM_CONSOLE_TTY ",${baudrate}" \ - " mem=${kernelmem} init=${init}" \ - CONFIG_KM_ECC_MODE \ - " phram.phram=phvar,${varaddr}," __stringify(CONFIG_KM_PHRAM)\ - " " CONFIG_KM_UBI_LINUX_MTD " " \ - CONFIG_KM_DEF_BOOT_ARGS_CPU \ - "\0" \ - "addpanic=" \ - "setenv bootargs ${bootargs} panic=1 panic_on_oops=1\0" \ - "flashargs=" \ - "setenv bootargs " \ - "root=mtdblock:rootfs${boot_bank} " \ - "rootfstype=squashfs ro\0" \ - "" - -/* - * flash_boot - * - commands for booting from flash - * - * - 'cramfsloadkernel': copy kernel from a cramfs to ram - * - 'ubiattach': attach ubi partition - * - 'ubicopy': copy ubi volume to ram - * - volume names: bootfs0, bootfs1, bootfs2, ... - * - * processor specific settings - * - 'cramfsloadfdt': copy fdt from a cramfs to ram - */ -#define CONFIG_KM_DEF_ENV_FLASH_BOOT \ - "cramfsaddr=" __stringify(CONFIG_KM_CRAMFS_ADDR) "\0" \ - "cramfsloadkernel=cramfsload ${load_addr_r} ${uimage}\0" \ - "ubicopy=ubi read ${cramfsaddr} bootfs${boot_bank}\0" \ - "uimage=" CONFIG_KM_UIMAGE_NAME \ - CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI - -/* - * constants - * - KM specific constants and commands - * - * - 'default': setup default environment - */ -#define CONFIG_KM_DEF_ENV_CONSTANTS \ - "backup_bank=0\0" \ - "release=run newenv; reset\0" \ - "pnvramsize=" __stringify(CONFIG_KM_PNVRAM) "\0" \ - "testbootcmd=setenv boot_bank ${test_bank}; " \ - "run ${subbootcmds}; reset\0" \ - "env_version=1\0" \ - "" - -#ifndef CONFIG_KM_DEF_ENV -#define CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ENV_BOOTPARAMS \ - "netdev=" __stringify(CONFIG_KM_DEF_NETDEV) "\0" \ - CONFIG_KM_DEF_ENV_CPU \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_DEF_ENV_BOOTARGS \ - CONFIG_KM_DEF_ENV_FLASH_BOOT \ - CONFIG_KM_DEF_ENV_CONSTANTS \ - "altbootcmd=run bootcmd\0" \ - "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ - "bootcmd=km_checkbidhwk && " \ - "setenv bootcmd \'if km_checktestboot; then; " \ - "setenv boot_bank ${test_bank}; else; " \ - "setenv boot_bank ${actual_bank}; fi;" \ - "run ${subbootcmds}; reset\' && " \ - "setenv altbootcmd \'setenv boot_bank ${backup_bank}; " \ - "run ${subbootcmds}; reset\' && " \ - "saveenv && saveenv && boot\0" \ - "cramfsloadfdt=" \ - "cramfsload ${fdt_addr_r} " \ - "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "fdt_addr_r=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "init=/sbin/init-overlay.sh\0" \ - "load_addr_r=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ - "load=tftpboot ${load_addr_r} ${u-boot}\0" \ - "" -#endif /* CONFIG_KM_DEF_ENV */ - -#endif /* __CONFIG_KEYMILE_H */ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 527f0383bc..532370e918 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -8,18 +8,6 @@ #ifndef __KMCENT2_H #define __KMCENT2_H -#define CONFIG_HOSTNAME "kmcent2" -#define KM_BOARD_NAME CONFIG_HOSTNAME - -/* - * The Linux fsl_fman driver needs to be able to process frames with more - * than just the VLAN tag (i.e. eDSA tag). It is passed as a kernel boot - * parameters - */ -#define CONFIG_KM_DEF_BOOT_ARGS_CPU "fsl_dpaa_fman.fsl_fm_max_frm=1558" - -#include "km/keymile-common.h" - /* Application IFC chip selects */ #define SYS_LAWAPP_BASE 0xc0000000 #define SYS_LAWAPP_BASE_PHYS (0xf00000000ull | SYS_LAWAPP_BASE) @@ -387,66 +375,4 @@ int get_scl(void); */ #define CFG_SYS_BOOTMAPSZ (64 << 20) /* Initial map for Linux*/ -/* - * Environment Configuration - */ -#ifndef CONFIG_KM_DEF_ENV /* if not set by keymile-common.h */ -#define CONFIG_KM_DEF_ENV -#endif - -#define __USB_PHY_TYPE utmi - -#define CONFIG_KM_DEF_ENV_CPU \ - "boot=bootm ${load_addr_r} - ${fdt_addr_r}\0" \ - "cramfsloadfdt=" \ - "cramfsload ${fdt_addr_r} " \ - "fdt_0x${IVM_BoardId}_0x${IVM_HWKey}.dtb\0" \ - "u-boot=" CONFIG_HOSTNAME "/u-boot.bin\0" \ - "update=protect off " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CONFIG_SYS_MONITOR_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +${filesize}\0" \ - "update-nor=protect off " __stringify(CFG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "erase " __stringify(CFG_SYS_FLASH_BASE) \ - " +${filesize} && " \ - "cp.b ${load_addr_r} " \ - __stringify(CFG_SYS_FLASH_BASE) " ${filesize} && " \ - "protect on " __stringify(CONFIG_SYS_MONITOR_BASE) \ - " +" __stringify(CONFIG_SYS_MONITOR_LEN) "\0" \ - "set_fdthigh=true\0" \ - "checkfdt=true\0" \ - "fpgacfg=true\0" \ - "" - -#define CONFIG_HW_ENV_SETTINGS \ - "hwconfig=fsl_ddr:ctlr_intlv=cacheline\0" \ - "usb_phy_type=" __stringify(__USB_PHY_TYPE) "\0" \ - "usb_dr_mode=host\0" - -#define CONFIG_KM_NEW_ENV \ - "newenv=protect off " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "erase " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) " && " \ - "protect on " __stringify(ENV_DEL_ADDR) \ - " +" __stringify(CONFIG_ENV_TOTAL_SIZE) "\0" - -/* ppc_82xx is the equivalent to ppc_6xx, the generic ppc toolchain */ -#ifndef CONFIG_KM_DEF_ARCH -#define CONFIG_KM_DEF_ARCH "arch=ppc_82xx\0" -#endif - -#define CONFIG_EXTRA_ENV_SETTINGS \ - CONFIG_KM_DEF_ENV \ - CONFIG_KM_DEF_ARCH \ - CONFIG_KM_NEW_ENV \ - CONFIG_HW_ENV_SETTINGS \ - "EEprom_ivm=pca9547:70:9\0" \ - "" - #endif /* __KMCENT2_H */ diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index 12c23a5dfd..f829a7927d 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -70,23 +70,8 @@ CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP -CONFIG_KM_DEF_ARCH -CONFIG_KM_DEF_BOOT_ARGS_CPU -CONFIG_KM_DEF_ENV -CONFIG_KM_DEF_ENV_BOOTARGS -CONFIG_KM_DEF_ENV_BOOTPARAMS CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_DEF_ENV_CONSTANTS -CONFIG_KM_DEF_ENV_CPU -CONFIG_KM_DEF_ENV_FLASH_BOOT -CONFIG_KM_DEV_ENV_FLASH_BOOT_UBI -CONFIG_KM_ECC_MODE CONFIG_KM_NEW_ENV -CONFIG_KM_UBI_LINUX_MTD -CONFIG_KM_UBI_PARTITION_NAME_APP -CONFIG_KM_UBI_PARTITION_NAME_BOOT -CONFIG_KM_UBI_PART_BOOT_OPTS -CONFIG_KM_UIMAGE_NAME CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE -- cgit v1.2.3 From 3bcf9c08a3de030438fcb91b27bf38e3235aafc5 Mon Sep 17 00:00:00 2001 From: Holger Brunck Date: Fri, 2 Dec 2022 18:22:40 +0100 Subject: board/km/secu: migrate to use environment text files Instead of having these defines in a header file, move them to a simple text file. Signed-off-by: Holger Brunck --- board/keymile/secu1/socfpga_secu.env | 50 ++++++++++++++++++++++++++++++++ configs/socfpga_secu1_defconfig | 4 +-- include/configs/socfpga_arria5_secu1.h | 53 ---------------------------------- scripts/config_whitelist.txt | 2 -- 4 files changed, 52 insertions(+), 57 deletions(-) create mode 100644 board/keymile/secu1/socfpga_secu.env (limited to 'scripts') diff --git a/board/keymile/secu1/socfpga_secu.env b/board/keymile/secu1/socfpga_secu.env new file mode 100644 index 0000000000..147c4170ef --- /dev/null +++ b/board/keymile/secu1/socfpga_secu.env @@ -0,0 +1,50 @@ +altbootcmd=run bootcmd; +bootlimit=6 +bootnum=1 +bootretry=CONFIG_BOOT_RETRY_TIME + +develop=tftp 0x200000 scripts/develop-secu.txt && + env import -t 0x200000 ${filesize} && + saveenv && + reset + +fdt_addr=CONFIG_KM_FDT_ADDR +load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp +loadaddr=CONFIG_KM_KERNEL_ADDR +newenv=nand erase 0x100000 0x40000 +release=run newenv; reset +socfpga_legacy_reset_compat=1 +update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize} + +userload=ubi part nand.ubi && + ubi check rootfs$bootnum && + ubi read $fdt_addr dtb$bootnum && + ubi read $loadaddr kernel$bootnum + +userboot=setenv bootargs console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id="idq,regbank" + ubi.mtd=1 ubi.block=0,rootfs$bootnum root=/dev/ubiblock0_$ubivolid ro + rootfstype=squashfs init=sbin/preinit; + bootz ${loadaddr} - ${fdt_addr} + +verify=y + +/* + * FPGA Remote Update related environment + * + * Note that since those commands access the FPGA, the HPS-to-FPGA bridges + * MUST have been previously enabled (for example with 'bridge enable'). + */ +rmtu_page=0xFF29000C +rmtu_reconfig=0xFF290018 +fpga_safebase=0x0 +fpga_userbase=0x2000000 + +_fpga_loaduser=echo "Loading FPGA USER image..." && + mw ${rmtu_page} ${fpga_userbase} && + mw ${rmtu_reconfig} 1 + +_fpga_loadsafe=echo "Loading FPGA SAFE image..." && + mw ${rmtu_page} ${fpga_safebase} && + mw ${rmtu_reconfig} 1 + + diff --git a/configs/socfpga_secu1_defconfig b/configs/socfpga_secu1_defconfig index 7a805df5a3..6e4fe588a1 100644 --- a/configs/socfpga_secu1_defconfig +++ b/configs/socfpga_secu1_defconfig @@ -3,7 +3,7 @@ CONFIG_SYS_L2_PL310=y CONFIG_ARCH_SOCFPGA=y CONFIG_SYS_MALLOC_LEN=0x4000000 CONFIG_SYS_MALLOC_F_LEN=0x800 -CONFIG_ENV_SIZE=0x1000 +CONFIG_ENV_SIZE=0x2000 CONFIG_ENV_OFFSET=0x100000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_secu1" @@ -24,7 +24,6 @@ CONFIG_BOOT_RETRY=y CONFIG_BOOT_RETRY_TIME=45 CONFIG_RESET_TO_RETRY=y CONFIG_USE_BOOTARGS=y -CONFIG_BOOTARGS="console=ttyS0,115200 ubi.fm_autoconvert=1 uio_pdrv_genirq.of_id=\"idq,regbank\"" CONFIG_BOOTCOMMAND="setenv bootcmd 'bridge enable; if test ${bootnum} = 'b'; then run _fpga_loadsafe; else if test ${bootcount} -eq 4; then echo 'Switching copy...'; setexpr x $bootnum % 2 && setexpr bootnum $x + 1; saveenv; fi; run _fpga_loaduser; fi;echo 'Booting bank $bootnum' && run userload && run userboot;' && setenv altbootcmd 'setenv bootnum b && saveenv && boot;' && saveenv && saveenv && boot;" CONFIG_DEFAULT_FDT_FILE="socfpga_arria5_secu1.dtb" CONFIG_SYS_CONSOLE_IS_IN_ENV=y @@ -65,6 +64,7 @@ CONFIG_CMD_UBI=y # CONFIG_CMD_UBIFS is not set # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set +CONFIG_ENV_SOURCE_FILE="socfpga_secu" CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 29b4b22b39..55168c2fb8 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -7,7 +7,6 @@ #define __CONFIG_SOCFPGA_SECU1_H__ #include -#include /* Eternal oscillator */ #define CFG_SYS_TIMER_RATE 40000000 @@ -23,58 +22,6 @@ */ #define CFG_SYS_I2C_RTC_ADDR 0x68 -/* Environment settings */ - -/* - * FPGA Remote Update related environment - * - * Note that since those commands access the FPGA, the HPS-to-FPGA - * bridges MUST have been previously enabled (for example - * with 'bridge enable'). - */ -#define FPGA_RMTU_ENV \ - "rmtu_page=0xFF29000C\0" \ - "rmtu_reconfig=0xFF290018\0" \ - "fpga_safebase=0x0\0" \ - "fpga_userbase=0x2000000\0" \ - "_fpga_loaduser=echo Loading FPGA USER image..." \ - " && mw ${rmtu_page} ${fpga_userbase} && mw ${rmtu_reconfig} 1\0" \ - "_fpga_loadsafe=echo Loading FPGA SAFE image..." \ - " && mw ${rmtu_page} ${fpga_safebase} && mw ${rmtu_reconfig} 1\0" \ - -#define CONFIG_KM_NEW_ENV \ - "newenv=" \ - "nand erase 0x100000 0x40000\0" - -#define CONFIG_KM_DEF_ENV_BOOTTARGETS \ - "release=" \ - "run newenv; reset\0" \ - "develop=" \ - "tftp 0x200000 scripts/develop-secu.txt && env import -t 0x200000 ${filesize} && saveenv && reset\0" - -#define CONFIG_EXTRA_ENV_SETTINGS \ - FPGA_RMTU_ENV \ - CONFIG_KM_DEF_ENV_BOOTTARGETS \ - CONFIG_KM_NEW_ENV \ - "socfpga_legacy_reset_compat=1\0" \ - "altbootcmd=run bootcmd;\0" \ - "bootlimit=6\0" \ - "bootnum=1\0" \ - "bootretry=" __stringify(CONFIG_BOOT_RETRY_TIME) "\0" \ - "fdt_addr=" __stringify(CONFIG_KM_FDT_ADDR) "\0" \ - "load=tftpboot ${loadaddr} u-boot-with-nand-spl.sfp\0" \ - "loadaddr=" __stringify(CONFIG_KM_KERNEL_ADDR) "\0" \ - "update=nand erase 0x0 0x00100000 && nand write ${loadaddr} 0x0 ${filesize}\0" \ - "userload=ubi part nand.ubi &&" \ - "ubi check rootfs$bootnum &&" \ - "ubi read $fdt_addr dtb$bootnum &&" \ - "ubi read $loadaddr kernel$bootnum\0" \ - "userboot=setenv bootargs " CONFIG_BOOTARGS \ - " ubi.mtd=1 ubi.block=0,rootfs$bootnum root=/dev/ubiblock0_$ubivolid" \ - " ro rootfstype=squashfs init=sbin/preinit;" \ - "bootz ${loadaddr} - ${fdt_addr}\0" \ - "verify=y\0" - /* The rest of the configuration is shared */ #include diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt index f829a7927d..a863665b2f 100644 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@ -70,8 +70,6 @@ CONFIG_IRAM_BASE CONFIG_IRAM_END CONFIG_IRAM_SIZE CONFIG_IRAM_TOP -CONFIG_KM_DEF_ENV_BOOTTARGETS -CONFIG_KM_NEW_ENV CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE -- cgit v1.2.3 From 207972acfc19bd64f390744c2636b9218f41673d Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 4 Dec 2022 10:03:37 -0500 Subject: global: Migrate CONFIG_BOARDDIR to CFG Perform a simple rename of CONFIG_BOARDDIR to CFG_BOARDDIR Signed-off-by: Tom Rini --- arch/sh/cpu/u-boot.lds | 2 +- doc/README.kwbimage | 2 +- scripts/Makefile.autoconf | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) (limited to 'scripts') diff --git a/arch/sh/cpu/u-boot.lds b/arch/sh/cpu/u-boot.lds index d360eea7eb..c31deecec6 100644 --- a/arch/sh/cpu/u-boot.lds +++ b/arch/sh/cpu/u-boot.lds @@ -35,7 +35,7 @@ SECTIONS .text : { KEEP(*/start.o (.text)) - KEEP(CONFIG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) + KEEP(CFG_BOARDDIR/lowlevel_init.o (.text .spiboot1.text)) KEEP(*(.spiboot2.text)) . = ALIGN(8192); #ifdef CONFIG_ENV_IS_IN_FLASH diff --git a/doc/README.kwbimage b/doc/README.kwbimage index 762b2e3acb..a1d247c32d 100644 --- a/doc/README.kwbimage +++ b/doc/README.kwbimage @@ -42,7 +42,7 @@ Board specific configuration file specifications: kwbimage.cfg. The name can be set as part of the full path to the file using CONFIG_SYS_KWD_CONFIG (probably in include/configs/.h). The path should look like: - $(CONFIG_BOARDDIR)/.cfg + $(CFG_BOARDDIR)/.cfg 2. This file can have empty lines and lines starting with "#" as first character to put comments 3. This file can have configuration command lines as mentioned below, diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index 5a4a148955..f5f5e4a4d5 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -112,7 +112,7 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg # Prior to Kconfig, it was generated by mkconfig. Now it is created here. define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ - echo \#define CONFIG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ + echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ echo \#include \; \ echo \#include \; \ echo \#include \; \ -- cgit v1.2.3 From 0478dac62a9add8c73981a900ceaa6da732ae2bb Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 4 Dec 2022 10:14:13 -0500 Subject: kbuild: Remove uncmd_spl logic At this point in the conversion there should be no need to have logic to disable some symbol during the SPL build as all symbols should have an SPL counterpart. The main real changes done here are that we now must make proper use of CONFIG_IS_ENABLED(DM_SERIAL) rather than many of the odd tricks we developed prior to CONFIG_IS_ENABLED() being available. Signed-off-by: Tom Rini --- board/freescale/common/i2c_common.c | 2 +- board/freescale/common/i2c_common.h | 2 +- drivers/misc/gsc.c | 2 +- drivers/serial/Makefile | 17 +---------------- drivers/serial/atmel_usart.c | 8 +++----- drivers/serial/serial-uclass.c | 6 +++--- drivers/serial/serial_mtk.c | 3 +-- drivers/serial/serial_pl01x.c | 11 +++-------- drivers/serial/serial_pl01x_internal.h | 2 +- include/config_uncmd_spl.h | 21 --------------------- include/configs/kmcent2.h | 2 +- include/configs/mv-common.h | 2 +- include/configs/sunxi-common.h | 2 +- include/configs/ti_omap4_common.h | 2 +- include/configs/x530.h | 2 +- include/ns16550.h | 10 +++++----- scripts/Makefile.autoconf | 1 - scripts/Makefile.build | 1 - scripts/Makefile.uncmd_spl | 14 -------------- 19 files changed, 25 insertions(+), 85 deletions(-) delete mode 100644 include/config_uncmd_spl.h delete mode 100644 scripts/Makefile.uncmd_spl (limited to 'scripts') diff --git a/board/freescale/common/i2c_common.c b/board/freescale/common/i2c_common.c index 0f09ed7d34..119ed3c617 100644 --- a/board/freescale/common/i2c_common.c +++ b/board/freescale/common/i2c_common.c @@ -9,7 +9,7 @@ #include #include "i2c_common.h" -#ifdef CONFIG_DM_I2C +#if CONFIG_IS_ENABLED(DM_I2C) /* If DM is in use, retrieve the chip for the specified bus number */ int fsl_i2c_get_device(int address, int bus, DEVICE_HANDLE_T *dev) diff --git a/board/freescale/common/i2c_common.h b/board/freescale/common/i2c_common.h index 840ad66183..77a7b6aedd 100644 --- a/board/freescale/common/i2c_common.h +++ b/board/freescale/common/i2c_common.h @@ -9,7 +9,7 @@ #define __NXP_I2C_COMMON_H__ /* Common functionality shared by the I2C drivers for VID and the mux. */ -#ifdef CONFIG_DM_I2C +#if CONFIG_IS_ENABLED(DM_I2C) #define DEVICE_HANDLE_T struct udevice * #define I2C_READ(dev, register, data, length) \ diff --git a/drivers/misc/gsc.c b/drivers/misc/gsc.c index ec24ca807b..65c9c2c6ce 100644 --- a/drivers/misc/gsc.c +++ b/drivers/misc/gsc.c @@ -77,7 +77,7 @@ enum { GSC_SC_RST_CAUSE_MAX = 10, }; -#if (IS_ENABLED(CONFIG_DM_I2C)) +#if CONFIG_IS_ENABLED(DM_I2C) struct gsc_priv { int gscver; diff --git a/drivers/serial/Makefile b/drivers/serial/Makefile index 33fa568221..37d3f82dbd 100644 --- a/drivers/serial/Makefile +++ b/drivers/serial/Makefile @@ -3,30 +3,15 @@ # (C) Copyright 2006-2009 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. -ifdef CONFIG_SPL_BUILD - -ifeq ($(CONFIG_$(SPL_TPL_)BUILD)$(CONFIG_$(SPL_TPL_)DM_SERIAL),yy) -obj-y += serial-uclass.o -else -obj-y += serial.o -endif - -else - -ifdef CONFIG_DM_SERIAL +ifeq ($(CONFIG_$(SPL_TPL_)DM_SERIAL),y) obj-y += serial-uclass.o else obj-y += serial.o endif -endif - -ifdef CONFIG_DM_SERIAL obj-$(CONFIG_PL01X_SERIAL) += serial_pl01x.o -else obj-$(CONFIG_PL011_SERIAL) += serial_pl01x.o obj-$(CONFIG_$(SPL_)SYS_NS16550_SERIAL) += serial_ns16550.o -endif obj-$(CONFIG_ALTERA_UART) += altera_uart.o obj-$(CONFIG_ALTERA_JTAG_UART) += altera_jtag_uart.o diff --git a/drivers/serial/atmel_usart.c b/drivers/serial/atmel_usart.c index 9d97bc8654..9853f49c94 100644 --- a/drivers/serial/atmel_usart.c +++ b/drivers/serial/atmel_usart.c @@ -18,7 +18,7 @@ #include #include -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED(DM_SERIAL) #include #endif #include @@ -28,7 +28,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED(DM_SERIAL) static void atmel_serial_setbrg_internal(atmel_usart3_t *usart, int id, int baudrate) { @@ -133,9 +133,7 @@ __weak struct serial_device *default_serial_console(void) { return &atmel_serial_drv; } -#endif - -#ifdef CONFIG_DM_SERIAL +#else enum serial_clk_type { CLK_TYPE_NORMAL = 0, CLK_TYPE_DBGU, diff --git a/drivers/serial/serial-uclass.c b/drivers/serial/serial-uclass.c index c02106747a..7240d763d1 100644 --- a/drivers/serial/serial-uclass.c +++ b/drivers/serial/serial-uclass.c @@ -407,7 +407,7 @@ void serial_stdio_init(void) { } -#if defined(CONFIG_DM_STDIO) +#if CONFIG_IS_ENABLED(DM_STDIO) #if CONFIG_IS_ENABLED(SERIAL_PRESENT) static void serial_stub_putc(struct stdio_dev *sdev, const char ch) @@ -505,7 +505,7 @@ U_BOOT_ENV_CALLBACK(baudrate, on_baudrate); static int serial_post_probe(struct udevice *dev) { struct dm_serial_ops *ops = serial_get_ops(dev); -#ifdef CONFIG_DM_STDIO +#if CONFIG_IS_ENABLED(DM_STDIO) struct serial_dev_priv *upriv = dev_get_uclass_priv(dev); struct stdio_dev sdev; #endif @@ -540,7 +540,7 @@ static int serial_post_probe(struct udevice *dev) return ret; } -#ifdef CONFIG_DM_STDIO +#if CONFIG_IS_ENABLED(DM_STDIO) if (!(gd->flags & GD_FLG_RELOC)) return 0; memset(&sdev, '\0', sizeof(sdev)); diff --git a/drivers/serial/serial_mtk.c b/drivers/serial/serial_mtk.c index 6fb4cb65c2..ded7346a13 100644 --- a/drivers/serial/serial_mtk.c +++ b/drivers/serial/serial_mtk.c @@ -173,8 +173,7 @@ static int _mtk_serial_pending(struct mtk_serial_priv *priv, bool input) return (readl(&priv->regs->lsr) & UART_LSR_THRE) ? 0 : 1; } -#if defined(CONFIG_DM_SERIAL) && \ - (!defined(CONFIG_SPL_BUILD) || defined(CONFIG_SPL_DM)) +#if CONFIG_IS_ENABLED(DM_SERIAL) static int mtk_serial_setbrg(struct udevice *dev, int baudrate) { struct mtk_serial_priv *priv = dev_get_priv(dev); diff --git a/drivers/serial/serial_pl01x.c b/drivers/serial/serial_pl01x.c index 7449e9b904..f5468353e1 100644 --- a/drivers/serial/serial_pl01x.c +++ b/drivers/serial/serial_pl01x.c @@ -27,8 +27,7 @@ DECLARE_GLOBAL_DATA_PTR; -#ifndef CONFIG_DM_SERIAL - +#if !CONFIG_IS_ENABLED(DM_SERIAL) static volatile unsigned char *const port[] = CFG_PL01x_PORTS; static enum pl01x_type pl01x_type __section(".data"); static struct pl01x_regs *base_regs __section(".data"); @@ -186,7 +185,7 @@ static int pl01x_generic_setbrg(struct pl01x_regs *regs, enum pl01x_type type, return 0; } -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED(DM_SERIAL) static void pl01x_serial_init_baud(int baudrate) { int clock = 0; @@ -273,11 +272,7 @@ __weak struct serial_device *default_serial_console(void) { return &pl01x_serial_drv; } - -#endif /* nCONFIG_DM_SERIAL */ - -#ifdef CONFIG_DM_SERIAL - +#else int pl01x_serial_setbrg(struct udevice *dev, int baudrate) { struct pl01x_serial_plat *plat = dev_get_plat(dev); diff --git a/drivers/serial/serial_pl01x_internal.h b/drivers/serial/serial_pl01x_internal.h index dfd95a0b77..71c52bb531 100644 --- a/drivers/serial/serial_pl01x_internal.h +++ b/drivers/serial/serial_pl01x_internal.h @@ -38,7 +38,7 @@ struct pl01x_regs { u32 pl011_cr; /* 0x30 Control register */ }; -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED(DM_SERIAL) int pl01x_serial_of_to_plat(struct udevice *dev); int pl01x_serial_probe(struct udevice *dev); diff --git a/include/config_uncmd_spl.h b/include/config_uncmd_spl.h deleted file mode 100644 index a59b9bbafb..0000000000 --- a/include/config_uncmd_spl.h +++ /dev/null @@ -1,21 +0,0 @@ -/* SPDX-License-Identifier: GPL-2.0+ */ -/* - * (C) Copyright 2012 - * Ilya Yanok, ilya.yanok@gmail.com - */ - -#ifndef __CONFIG_UNCMD_SPL_H__ -#define __CONFIG_UNCMD_SPL_H__ - -#ifdef CONFIG_SPL_BUILD -/* SPL needs only BOOTP + TFTP so undefine other stuff to save space */ - -#ifndef CONFIG_SPL_DM -#undef CONFIG_DM_SERIAL -#undef CONFIG_DM_I2C -#endif - -#undef CONFIG_DM_STDIO - -#endif /* CONFIG_SPL_BUILD */ -#endif /* __CONFIG_UNCMD_SPL_H__ */ diff --git a/include/configs/kmcent2.h b/include/configs/kmcent2.h index 60fea59dee..e7ae18ec5f 100644 --- a/include/configs/kmcent2.h +++ b/include/configs/kmcent2.h @@ -314,7 +314,7 @@ * shorted - index 1 * Retain non-DM serial port for debug purposes. */ -#if !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CFG_SYS_NS16550_CLK (get_bus_freq(0) / 2) #define CFG_SYS_NS16550_COM1 (CFG_SYS_CCSRBAR + 0x11C500) #endif diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index fa275d61d1..3dfcb138b4 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -33,7 +33,7 @@ * NS16550 Configuration */ #define CFG_SYS_NS16550_CLK CFG_SYS_TCLK -#if !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE #endif diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index eae107fe5e..8032abe769 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -23,7 +23,7 @@ #else #define CFG_SYS_NS16550_CLK 24000000 #endif -#ifndef CONFIG_DM_SERIAL +#if !CONFIG_IS_ENABLED(DM_SERIAL) # define CFG_SYS_NS16550_COM1 SUNXI_UART0_BASE # define CFG_SYS_NS16550_COM2 SUNXI_UART1_BASE # define CFG_SYS_NS16550_COM3 SUNXI_UART2_BASE diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 49f4263e16..9e312ac16d 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -28,7 +28,7 @@ * Hardware drivers */ #define CFG_SYS_NS16550_CLK 48000000 -#if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CFG_SYS_NS16550_COM3 UART3_BASE #endif diff --git a/include/configs/x530.h b/include/configs/x530.h index fddf00d3d1..e1678e79e4 100644 --- a/include/configs/x530.h +++ b/include/configs/x530.h @@ -14,7 +14,7 @@ * NS16550 Configuration */ #define CFG_SYS_NS16550_CLK CFG_SYS_TCLK -#if !defined(CONFIG_DM_SERIAL) +#if !CONFIG_IS_ENABLED(DM_SERIAL) #define CFG_SYS_NS16550_COM1 MV_UART_CONSOLE_BASE #endif diff --git a/include/ns16550.h b/include/ns16550.h index 0ee5c4d6de..f45fc8cecc 100644 --- a/include/ns16550.h +++ b/include/ns16550.h @@ -26,7 +26,7 @@ #include -#if defined(CONFIG_DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE) +#if CONFIG_IS_ENABLED(DM_SERIAL) && !defined(CONFIG_SYS_NS16550_REG_SIZE) /* * For driver model we always use one byte per register, and sort out the * differences in the driver @@ -37,10 +37,10 @@ #ifdef CONFIG_NS16550_DYNAMIC #define UART_REG(x) unsigned char x #else -#if !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) -#error "Please define NS16550 registers size." -#elif defined(CONFIG_SYS_NS16550_MEM32) && !defined(CONFIG_DM_SERIAL) +#if defined(CONFIG_SYS_NS16550_MEM32) && !CONFIG_IS_ENABLED(DM_SERIAL) #define UART_REG(x) u32 x +#elif !defined(CONFIG_SYS_NS16550_REG_SIZE) || (CONFIG_SYS_NS16550_REG_SIZE == 0) +#error "Please define NS16550 registers size." #elif (CONFIG_SYS_NS16550_REG_SIZE > 0) #define UART_REG(x) \ unsigned char prepad_##x[CONFIG_SYS_NS16550_REG_SIZE - 1]; \ @@ -113,7 +113,7 @@ struct ns16550 { UART_REG(scr); /* 10*/ UART_REG(ssr); /* 11*/ #endif -#ifdef CONFIG_DM_SERIAL +#if CONFIG_IS_ENABLED(DM_SERIAL) struct ns16550_plat *plat; #endif }; diff --git a/scripts/Makefile.autoconf b/scripts/Makefile.autoconf index f5f5e4a4d5..0ade91642a 100644 --- a/scripts/Makefile.autoconf +++ b/scripts/Makefile.autoconf @@ -113,7 +113,6 @@ vpl/include/autoconf.mk: vpl/u-boot.cfg define filechk_config_h (echo "/* Automatically generated - do not edit */"; \ echo \#define CFG_BOARDDIR board/$(if $(VENDOR),$(VENDOR)/)$(BOARD);\ - echo \#include \; \ echo \#include \; \ echo \#include \; \ echo \#include \; \ diff --git a/scripts/Makefile.build b/scripts/Makefile.build index 3b8c9d8c31..97dd4a64f6 100644 --- a/scripts/Makefile.build +++ b/scripts/Makefile.build @@ -48,7 +48,6 @@ subdir-ccflags-y := # Modified for U-Boot -include include/config/auto.conf -include $(prefix)/include/autoconf.mk -include scripts/Makefile.uncmd_spl include scripts/Kbuild.include diff --git a/scripts/Makefile.uncmd_spl b/scripts/Makefile.uncmd_spl deleted file mode 100644 index 6ea097d36d..0000000000 --- a/scripts/Makefile.uncmd_spl +++ /dev/null @@ -1,14 +0,0 @@ -# SPDX-License-Identifier: GPL-2.0+ -# Makefile version of include/config_uncmd_spl.h -# TODO: Invent a better way - -ifdef CONFIG_SPL_BUILD - -ifndef CONFIG_SPL_DM -CONFIG_DM_SERIAL= -CONFIG_DM_I2C= -CONFIG_DM_SPI= -CONFIG_DM_SPI_FLASH= -endif - -endif -- cgit v1.2.3 From 2a06da08e7897deb08c204df1c2f7853c4e61806 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 4 Dec 2022 10:14:14 -0500 Subject: checkpatch.pl: Update CONFIG logic in U-Boot section Now that all CONFIG symbols are in Kconfig, checkpatch.pl should check for and error on any case of define/undef CONFIG_*. Signed-off-by: Tom Rini --- scripts/checkpatch.pl | 8 ++++---- tools/patman/test_checkpatch.py | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) (limited to 'scripts') diff --git a/scripts/checkpatch.pl b/scripts/checkpatch.pl index fe13e265a3..ccfcbb3e12 100755 --- a/scripts/checkpatch.pl +++ b/scripts/checkpatch.pl @@ -2630,10 +2630,10 @@ sub u_boot_line { "strl$1 is preferred over strn$1 because it always produces a nul-terminated string\n" . $herecurr); } - # use defconfig to manage CONFIG_CMD options - if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_CMD\w*)\b/) { - ERROR("DEFINE_CONFIG_CMD", - "All commands are managed by Kconfig\n" . $herecurr); + # use Kconfig for all CONFIG symbols + if ($line =~ /\+\s*#\s*(define|undef)\s+(CONFIG_\w*)\b/) { + ERROR("DEFINE_CONFIG_SYM", + "All CONFIG symbols are managed by Kconfig\n" . $herecurr); } # Don't put common.h and dm.h in header files diff --git a/tools/patman/test_checkpatch.py b/tools/patman/test_checkpatch.py index 8960cd505f..4c2ab6e590 100644 --- a/tools/patman/test_checkpatch.py +++ b/tools/patman/test_checkpatch.py @@ -396,7 +396,7 @@ index 0000000..2234c87 """Test for enabling/disabling commands using preprocesor""" pm = PatchMaker() pm.add_line('common/main.c', '#undef CONFIG_CMD_WHICH') - self.check_single_message(pm, 'DEFINE_CONFIG_CMD', 'error') + self.check_single_message(pm, 'DEFINE_CONFIG_SYM', 'error') def test_barred_include_in_hdr(self): """Test for using a barred include in a header file""" -- cgit v1.2.3 From 9ef3ba85bf38289a3e3b0dcb92fad9480a0b1834 Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Sun, 4 Dec 2022 10:14:16 -0500 Subject: kbuild: Remove checking for adhoc CONFIG symbols At this point all listed adhoc CONFIG symbols have been migrated to Kconfig or removed from the tree or renamed to CFG (or similar). We also now have CI tests that will error on any new introductions, and checkpatch.pl also looks. We can now remove these hooks and related scripts. Signed-off-by: Tom Rini --- Makefile | 8 -- scripts/build-whitelist.sh | 45 -------- scripts/check-config.sh | 63 ----------- scripts/config_whitelist.txt | 245 ------------------------------------------- tools/moveconfig.py | 32 +----- 5 files changed, 2 insertions(+), 391 deletions(-) delete mode 100755 scripts/build-whitelist.sh delete mode 100755 scripts/check-config.sh delete mode 100644 scripts/config_whitelist.txt (limited to 'scripts') diff --git a/Makefile b/Makefile index 8cd873fd5f..5610f7b492 100644 --- a/Makefile +++ b/Makefile @@ -1075,10 +1075,6 @@ cmd_lzma = lzma -c -z -k -9 $< > $@ cfg: u-boot.cfg -quiet_cmd_cfgcheck = CFGCHK $2 -cmd_cfgcheck = $(srctree)/scripts/check-config.sh $2 \ - $(srctree)/scripts/config_whitelist.txt $(srctree) - quiet_cmd_ofcheck = OFCHK $2 cmd_ofcheck = $(srctree)/scripts/check-of.sh $2 \ $(srctree)/scripts/of_allowlist.txt @@ -1146,10 +1142,6 @@ endif $(call deprecated,CONFIG_TIMER,Timer drivers,v2023.01,$(if $(strip $(CFG_SYS_TIMER_RATE)$(CFG_SYS_TIMER_COUNTER)),x)) $(call deprecated,CONFIG_DM_SERIAL,Serial drivers,v2023.04,$(CONFIG_SERIAL)) $(call deprecated,CONFIG_DM_SCSI,SCSI drivers,v2023.04,$(CONFIG_SCSI)) - @# Check that this build does not use CONFIG options that we do not - @# know about unless they are in Kconfig. All the existing CONFIG - @# options are whitelisted, so new ones should not be added. - $(call cmd,cfgcheck,u-boot.cfg) @# Check that this build does not override OF_HAS_PRIOR_STAGE by @# disabling OF_BOARD. $(call cmd,ofcheck,$(KCONFIG_CONFIG)) diff --git a/scripts/build-whitelist.sh b/scripts/build-whitelist.sh deleted file mode 100755 index 37630c0271..0000000000 --- a/scripts/build-whitelist.sh +++ /dev/null @@ -1,45 +0,0 @@ -#!/bin/sh -# Copyright (c) 2016 Google, Inc -# Written by Simon Glass -# - -# This script creates the configuration whitelist file. This file contains -# all the config options which are allowed to be used outside Kconfig. -# Please do not add things to the whitelist. Instead, add your new option -# to Kconfig. -# -export LC_ALL=C LC_COLLATE=C - -# Looks for the rest of the CONFIG options, but exclude those in Kconfig and -# defconfig files. -# -git grep CONFIG_ | \ - egrep -vi "(Kconfig:|defconfig:|README|\.py|\.pl:)" \ - | tr ' \t' '\n\n' \ - | sed -n 's/^\(CONFIG_[A-Za-z0-9_]*\).*/\1/p' \ - |sort |uniq >scripts/config_whitelist.txt.tmp1; - -# Finally, we need a list of the valid Kconfig options to exclude these from -# the whitelist. -cat `find . -name "Kconfig*"` |sed -n \ - -e 's/^\s*config *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - -e 's/^\s*menuconfig *\([A-Za-z0-9_]*\).*$/CONFIG_\1/p' \ - |sort |uniq >scripts/config_whitelist.txt.tmp2 - -# Use only the options that are present in the first file but not the second. -comm -23 scripts/config_whitelist.txt.tmp1 scripts/config_whitelist.txt.tmp2 \ - |sort |uniq >scripts/config_whitelist.txt.tmp3 - -# If scripts/config_whitelist.txt already exists, take the intersection of the -# current list and the new one. We do not want to increase whitelist options. -if [ -r scripts/config_whitelist.txt ]; then - comm -12 scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt \ - > scripts/config_whitelist.txt.tmp4 - mv scripts/config_whitelist.txt.tmp4 scripts/config_whitelist.txt -else - mv scripts/config_whitelist.txt.tmp3 scripts/config_whitelist.txt -fi - -rm scripts/config_whitelist.txt.tmp* - -unset LC_ALL LC_COLLATE diff --git a/scripts/check-config.sh b/scripts/check-config.sh deleted file mode 100755 index cc1c9a54d9..0000000000 --- a/scripts/check-config.sh +++ /dev/null @@ -1,63 +0,0 @@ -#!/bin/sh -# Copyright (c) 2016 Google, Inc -# Written by Simon Glass -# -# Check that the u-boot.cfg file provided does not introduce any new -# ad-hoc CONFIG options -# -# Use scripts/build-whitelist.sh to generate the list of current ad-hoc -# CONFIG options (those which are not in Kconfig). - -# Usage -# check-config.sh -# -# For example: -# scripts/check-config.sh b/chromebook_link/u-boot.cfg kconfig_whitelist.txt . - -set -e -set -u - -PROG_NAME="${0##*/}" - -usage() { - echo "$PROG_NAME " - exit 1 -} - -[ $# -ge 3 ] || usage - -path="$1" -whitelist="$2" -srctree="$3" - -# Temporary files -configs="${path}.configs" -suspects="${path}.suspects" -ok="${path}.ok" -new_adhoc="${path}.adhoc" - -export LC_ALL=C -export LC_COLLATE=C - -cat ${path} |sed -nr 's/^#define (CONFIG_[A-Za-z0-9_]*).*/\1/p' |sort |uniq \ - >${configs} - -comm -23 ${configs} ${whitelist} > ${suspects} - -cat `find ${srctree} -name "Kconfig*"` |sed -nr \ - -e 's/^[[:blank:]]*config *([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ - -e 's/^[[:blank:]]*menuconfig ([A-Za-z0-9_]*).*$/CONFIG_\1/p' \ - |sort |uniq > ${ok} -comm -23 ${suspects} ${ok} >${new_adhoc} -if [ -s ${new_adhoc} ]; then - echo >&2 "Error: You must add new CONFIG options using Kconfig" - echo >&2 "The following new ad-hoc CONFIG options were detected:" - cat >&2 ${new_adhoc} - echo >&2 - echo >&2 "Please add these via Kconfig instead. Find a suitable Kconfig" - echo >&2 "file and add a 'config' or 'menuconfig' option." - # Don't delete the temporary files in case they are useful - exit 1 -else - rm ${suspects} ${ok} ${new_adhoc} -fi diff --git a/scripts/config_whitelist.txt b/scripts/config_whitelist.txt deleted file mode 100644 index 9e346fbc44..0000000000 --- a/scripts/config_whitelist.txt +++ /dev/null @@ -1,245 +0,0 @@ -CONFIG_ARM_GIC_BASE_ADDRESS -CONFIG_BOARDDIR -CONFIG_DFU_ALT -CONFIG_DFU_ALT_BOOT_EMMC -CONFIG_DFU_ALT_BOOT_SD -CONFIG_DFU_ALT_SYSTEM -CONFIG_DFU_ENV_SETTINGS -CONFIG_DM9000_BASE -CONFIG_DM9000_BYTE_SWAPPED -CONFIG_DM9000_NO_SROM -CONFIG_DM9000_USE_16BIT -CONFIG_DW_WDT_CLOCK_KHZ -CONFIG_ENV_FLAGS_LIST_STATIC -CONFIG_ENV_IS_EMBEDDED -CONFIG_ENV_SETTINGS_BUTTONS_AND_LEDS -CONFIG_ENV_SETTINGS_NAND_V1 -CONFIG_ENV_SETTINGS_NAND_V2 -CONFIG_ENV_SETTINGS_V1 -CONFIG_ENV_SETTINGS_V2 -CONFIG_ENV_SROM_BANK -CONFIG_ENV_TOTAL_SIZE -CONFIG_ET1100_BASE -CONFIG_ETHBASE -CONFIG_EXTRA_ENV_SETTINGS -CONFIG_FB_ADDR -CONFIG_FDTADDR -CONFIG_FDTFILE -CONFIG_FEC_ENET_DEV -CONFIG_FEC_FIXED_SPEED -CONFIG_FEC_MXC_PHYADDR -CONFIG_FLASH_BR_PRELIM -CONFIG_FLASH_OR_PRELIM -CONFIG_FLASH_SECTOR_SIZE -CONFIG_FLASH_SHOW_PROGRESS -CONFIG_FLASH_SPANSION_S29WS_N -CONFIG_FLASH_VERIFY -CONFIG_FM_PLAT_CLK_DIV -CONFIG_FSL_CPLD -CONFIG_FSL_ESDHC_PIN_MUX -CONFIG_FSL_FM_10GEC_REGULAR_NOTATION -CONFIG_FSL_ISBC_KEY_EXT -CONFIG_FSL_PMIC_BITLEN -CONFIG_FSL_PMIC_BUS -CONFIG_FSL_PMIC_CLK -CONFIG_FSL_PMIC_CS -CONFIG_FSL_PMIC_MODE -CONFIG_FSL_SDHC_V2_3 -CONFIG_FSL_SERDES1 -CONFIG_FSL_SERDES2 -CONFIG_GATEWAYIP -CONFIG_GMII -CONFIG_G_DNL_THOR_PRODUCT_NUM -CONFIG_G_DNL_THOR_VENDOR_NUM -CONFIG_G_DNL_UMS_PRODUCT_NUM -CONFIG_G_DNL_UMS_VENDOR_NUM -CONFIG_HDMI_ENCODER_I2C_ADDR -CONFIG_HOSTNAME -CONFIG_HSMMC2_8BIT -CONFIG_HW_ENV_SETTINGS -CONFIG_I2C_ENV_EEPROM_BUS -CONFIG_I2C_MULTI_BUS -CONFIG_I2C_MVTWSI -CONFIG_I2C_MVTWSI_BASE0 -CONFIG_I2C_MVTWSI_BASE1 -CONFIG_I2C_RTC_ADDR -CONFIG_ICS307_REFCLK_HZ -CONFIG_IMX6_PWM_PER_CLK -CONFIG_IPADDR -CONFIG_IRAM_BASE -CONFIG_IRAM_END -CONFIG_IRAM_SIZE -CONFIG_IRAM_TOP -CONFIG_KSNET_CPSW_NUM_PORTS -CONFIG_KSNET_MAC_ID_BASE -CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE -CONFIG_KSNET_NETCP_BASE -CONFIG_KSNET_NETCP_V1_0 -CONFIG_KSNET_NETCP_V1_5 -CONFIG_KSNET_SERDES_LANES_PER_SGMII -CONFIG_KSNET_SERDES_SGMII2_BASE -CONFIG_KSNET_SERDES_SGMII_BASE -CONFIG_L1_INIT_RAM -CONFIG_L2_CACHE -CONFIG_LEGACY_BOOTCMD_ENV -CONFIG_LOWPOWER_ADDR -CONFIG_LOWPOWER_FLAG -CONFIG_LPC32XX_NAND_MLC_BUSY_DELAY -CONFIG_LPC32XX_NAND_MLC_NAND_TA -CONFIG_LPC32XX_NAND_MLC_RD_HIGH -CONFIG_LPC32XX_NAND_MLC_RD_LOW -CONFIG_LPC32XX_NAND_MLC_TCEA_DELAY -CONFIG_LPC32XX_NAND_MLC_WR_HIGH -CONFIG_LPC32XX_NAND_MLC_WR_LOW -CONFIG_LPC32XX_NAND_SLC_RDR_CLKS -CONFIG_LPC32XX_NAND_SLC_RHOLD -CONFIG_LPC32XX_NAND_SLC_RSETUP -CONFIG_LPC32XX_NAND_SLC_RWIDTH -CONFIG_LPC32XX_NAND_SLC_WDR_CLKS -CONFIG_LPC32XX_NAND_SLC_WHOLD -CONFIG_LPC32XX_NAND_SLC_WSETUP -CONFIG_LPC32XX_NAND_SLC_WWIDTH -CONFIG_MACB_SEARCH_PHY -CONFIG_MALLOC_F_ADDR -CONFIG_MALTA -CONFIG_MAX_DSP_CPUS -CONFIG_MAX_MEM_MAPPED -CONFIG_MAX_RAM_BANK_SIZE -CONFIG_MEMSIZE_IN_BYTES -CONFIG_MEM_INIT_VALUE -CONFIG_MFG_ENV_SETTINGS -CONFIG_MII_DEFAULT_TSEC -CONFIG_MIU_2BIT_21_7_INTERLEAVED -CONFIG_MIU_2BIT_INTERLEAVED -CONFIG_MMC_DEFAULT_DEV -CONFIG_MONITOR_IS_IN_RAM -CONFIG_MTD_NAND_VERIFY_WRITE -CONFIG_MVGBE_PORTS -CONFIG_MXC_GPT_HCLK -CONFIG_MXC_NAND_HWECC -CONFIG_MXC_NAND_IP_REGS_BASE -CONFIG_MXC_NAND_REGS_BASE -CONFIG_MXC_UART_BASE -CONFIG_MXC_USB_FLAGS -CONFIG_MXC_USB_PORT -CONFIG_MXC_USB_PORTSC -CONFIG_NAND_6BYTES_OOB_FREE_10BYTES_ECC -CONFIG_NAND_CS_INIT -CONFIG_NETDEV -CONFIG_NETMASK -CONFIG_NORBOOT -CONFIG_NUM_DSP_CPUS -CONFIG_ODROID_REV_AIN -CONFIG_OTHBOOTARGS -CONFIG_OVERWRITE_ETHADDR_ONCE -CONFIG_PCIE_IMX_PERST_GPIO -CONFIG_PCIE_IMX_POWER_GPIO -CONFIG_PEN_ADDR_BIG_ENDIAN -CONFIG_PHY_BASE_ADR -CONFIG_PHY_ET1011C_TX_CLK_FIX -CONFIG_PHY_ID -CONFIG_PHY_INTERFACE_MODE -CONFIG_PHY_IRAM_BASE -CONFIG_PL011_CLOCK -CONFIG_PL01x_PORTS -CONFIG_PME_PLAT_CLK_DIV -CONFIG_POST -CONFIG_POSTBOOTMENU -CONFIG_POST_EXTERNAL_WORD_FUNCS -CONFIG_POWER_LTC3676_I2C_ADDR -CONFIG_POWER_PFUZE100_I2C_ADDR -CONFIG_POWER_PFUZE3000_I2C_ADDR -CONFIG_PPC_SPINTABLE_COMPATIBLE -CONFIG_PRAM -CONFIG_PSRAM_SCFG -CONFIG_QBMAN_CLK_DIV -CONFIG_RAMBOOT_SPIFLASH -CONFIG_RAMBOOT_TEXT_BASE -CONFIG_RAMDISK_ADDR -CONFIG_RD_LVL -CONFIG_RESET_VECTOR_ADDRESS -CONFIG_ROCKCHIP_SDHCI_MAX_FREQ -CONFIG_ROOTPATH -CONFIG_SANDBOX_ARCH -CONFIG_SANDBOX_SDL -CONFIG_SANDBOX_SPI_MAX_BUS -CONFIG_SANDBOX_SPI_MAX_CS -CONFIG_SAR2_REG -CONFIG_SAR_REG -CONFIG_SCIF_A -CONFIG_SCSI_DEV_LIST -CONFIG_SC_TIMER_CLK -CONFIG_SERIAL_BOOT -CONFIG_SERVERIP -CONFIG_SETUP_INITRD_TAG -CONFIG_SET_DFU_ALT_BUF_LEN -CONFIG_SH_ETHER_ALIGNE_SIZE -CONFIG_SH_ETHER_CACHE_INVALIDATE -CONFIG_SH_ETHER_CACHE_WRITEBACK -CONFIG_SH_ETHER_PHY_ADDR -CONFIG_SH_ETHER_PHY_MODE -CONFIG_SH_ETHER_USE_PORT -CONFIG_SH_QSPI_BASE -CONFIG_SLIC -CONFIG_SMDK5420 -CONFIG_SMP_PEN_ADDR -CONFIG_SOCRATES -CONFIG_SPI_ADDR -CONFIG_SPI_BOOTING -CONFIG_SPI_FLASH_QUAD -CONFIG_SPI_FLASH_SIZE -CONFIG_SPI_HALF_DUPLEX -CONFIG_SPI_N25Q256A_RESET -CONFIG_STACKBASE -CONFIG_STANDALONE_LOAD_ADDR -CONFIG_STD_DEVICES_SETTINGS -CONFIG_SYS_BAUDRATE_TABLE -CONFIG_TEGRA_BOARD_STRING -CONFIG_TEGRA_ENABLE_UARTA -CONFIG_TEGRA_ENABLE_UARTD -CONFIG_TEGRA_SLINK_CTRLS -CONFIG_TEGRA_SPI -CONFIG_TEGRA_UARTA_GPU -CONFIG_TEGRA_UARTA_SDIO1 -CONFIG_TEGRA_VDD_CORE_TPS62361B_SET3 -CONFIG_TEGRA_VDD_CORE_TPS62366A_SET1 -CONFIG_TESTPIN_MASK -CONFIG_TESTPIN_REG -CONFIG_THOR_RESET_OFF -CONFIG_TPM_TIS_BASE_ADDRESS -CONFIG_TSEC1 -CONFIG_TSEC1_NAME -CONFIG_TSEC2 -CONFIG_TSEC2_NAME -CONFIG_TSEC3 -CONFIG_TSEC3_NAME -CONFIG_TSEC4 -CONFIG_TSEC4_NAME -CONFIG_TSECV2 -CONFIG_TSECV2_1 -CONFIG_TSEC_TBICR_SETTINGS -CONFIG_UBIFS_VOLUME -CONFIG_UBI_PART -CONFIG_UBOOTPATH -CONFIG_UBOOT_SECTOR_COUNT -CONFIG_UBOOT_SECTOR_START -CONFIG_UEC_ETH -CONFIG_USART_BASE -CONFIG_USART_ID -CONFIG_USBD_HS -CONFIG_USB_BOOTING -CONFIG_USB_EXT2_BOOT -CONFIG_USB_FAT_BOOT -CONFIG_USB_ISP1301_I2C_ADDR -CONFIG_U_BOOT_HDR_SIZE -CONFIG_VAR_SIZE_SPL -CONFIG_VERY_BIG_RAM -CONFIG_VSC7385_IMAGE -CONFIG_VSC7385_IMAGE_SIZE -CONFIG_WATCHDOG_PRESC -CONFIG_WATCHDOG_RC -CONFIG_WATCHDOG_TIMEOUT -CONFIG_X86EMU_RAW_IO -CONFIG_X86_MRC_ADDR -CONFIG_X86_REFCODE_ADDR -CONFIG_X86_REFCODE_RUN_ADDR diff --git a/tools/moveconfig.py b/tools/moveconfig.py index 09617a07f9..8f084a6070 100755 --- a/tools/moveconfig.py +++ b/tools/moveconfig.py @@ -443,22 +443,6 @@ def cleanup_headers(configs, args): cleanup_one_header(header_path, patterns, args) cleanup_empty_blocks(header_path, args) -def cleanup_whitelist(configs, args): - """Delete config whitelist entries - - Args: - configs: A list of CONFIGs to remove. - args (Namespace): program arguments - """ - if not confirm(args, 'Clean up whitelist entries?'): - return - - lines = read_file(os.path.join('scripts', 'config_whitelist.txt')) - - lines = [x for x in lines if x.strip() not in configs] - - write_file(os.path.join('scripts', 'config_whitelist.txt'), lines) - def find_matching(patterns, line): for pat in patterns: if pat.search(line): @@ -1558,14 +1542,10 @@ def do_find_config(config_list): """ all_configs, all_defconfigs, config_db, defconfig_db = read_database() - # Get the whitelist - adhoc_configs = set(read_file('scripts/config_whitelist.txt')) - # Start with all defconfigs out = all_defconfigs # Work through each config in turn - adhoc = [] for item in config_list: # Get the real config name and whether we want this config or not cfg = item @@ -1574,10 +1554,6 @@ def do_find_config(config_list): want = False cfg = cfg[1:] - if cfg in adhoc_configs: - adhoc.append(cfg) - continue - # Search everything that is still in the running. If it has a config # that we want, or doesn't have one that we don't, add it into the # running for the next stage @@ -1588,11 +1564,8 @@ def do_find_config(config_list): has_cfg = defconfig_matches(config_db[defc], re_match) if has_cfg == want: out.add(defc) - if adhoc: - print(f"Error: Not in Kconfig: %s" % ' '.join(adhoc)) - else: - print(f'{len(out)} matches') - print(' '.join(item.split('_defconfig')[0] for item in out)) + print(f'{len(out)} matches') + print(' '.join(item.split('_defconfig')[0] for item in out)) def prefix_config(cfg): @@ -1739,7 +1712,6 @@ doc/develop/moveconfig.rst for documentation.''' if configs: cleanup_headers(configs, args) - cleanup_whitelist(configs, args) cleanup_readme(configs, args) if args.commit: -- cgit v1.2.3