From: Tom Rini Date: Mon, 4 Oct 2021 15:27:55 +0000 (-0400) Subject: Merge branch 'next' X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=50c84208ad50a27382c64af911abba4510a8b608;p=u-boot.git Merge branch 'next' Signed-off-by: Tom Rini --- 50c84208ad50a27382c64af911abba4510a8b608 diff --cc scripts/config_whitelist.txt index a9c2380d17,61ae682dcd..5bcd2c26c4 --- a/scripts/config_whitelist.txt +++ b/scripts/config_whitelist.txt @@@ -8,27 -4,15 +4,13 @@@ CONFIG_83XX_PCICL CONFIG_88F5182 CONFIG_A003399_NOR_WORKAROUND CONFIG_A008044_WORKAROUND - CONFIG_ACX517AKN - CONFIG_ACX544AKN - CONFIG_ADDRESS - CONFIG_ADDR_AUTO_INCR_BIT - CONFIG_ADNPESC1 CONFIG_AEABI --CONFIG_AEMIF_CNTRL_BASE - CONFIG_ALTERA_SPI_IDLE_VAL - CONFIG_ALU CONFIG_AM335X_USB0 CONFIG_AM335X_USB0_MODE CONFIG_AM335X_USB1 CONFIG_AM335X_USB1_MODE --CONFIG_AM437X_USB2PHY2_HOST CONFIG_ANDES_PCU CONFIG_ANDES_PCU_BASE - CONFIG_APER_0_BASE - CONFIG_APER_1_BASE - CONFIG_APER_SIZE - CONFIG_APUS_FAST_EXCEPT CONFIG_ARCH_ADPAG101P CONFIG_ARCH_HAS_ILOG2_U32 CONFIG_ARCH_HAS_ILOG2_U64 @@@ -37,8 -21,7 +19,6 @@@ CONFIG_ARCH_OMAP CONFIG_ARCH_RMOBILE_EXTRAM_BOOT CONFIG_ARCH_USE_BUILTIN_BSWAP CONFIG_ARC_MMU_VER --CONFIG_ARMADA100 - CONFIG_ARMADA168 CONFIG_ARMV7_SECURE_BASE CONFIG_ARMV7_SECURE_MAX_SIZE CONFIG_ARMV7_SECURE_RESERVE_SIZE @@@ -171,11 -142,10 +138,7 @@@ CONFIG_CM_INI CONFIG_CM_MULTIPLE_SSRAM CONFIG_CM_REMAP CONFIG_CM_SPD_DETECT --CONFIG_CM_T335 --CONFIG_CM_T3X --CONFIG_CM_T43 CONFIG_CM_TCRAM - CONFIG_CNTL CONFIG_COLDFIRE CONFIG_COMMANDS CONFIG_COMMON_BOOT @@@ -370,14 -291,10 +284,8 @@@ CONFIG_ESDHC_DETECT_QUIR CONFIG_ESDHC_HC_BLK_ADDR CONFIG_ESPRESSO7420 CONFIG_ET1100_BASE -CONFIG_ETH1ADDR -CONFIG_ETH2ADDR CONFIG_ETHADDR CONFIG_ETHBASE - CONFIG_ETHER_INDEX - CONFIG_ETHER_NONE - CONFIG_ETHER_ON_FCC - CONFIG_ETHER_ON_FCC1 - CONFIG_ETHER_ON_FCC2 - CONFIG_ETHER_ON_FCC3 CONFIG_ETHPRIME CONFIG_ETH_BUFSIZE CONFIG_ETH_RXSIZE @@@ -757,15 -666,14 +654,9 @@@ CONFIG_JFFS2_PART_SIZ CONFIG_JFFS2_SUMMARY CONFIG_JRSTARTR_JR0 CONFIG_JTAG_CONSOLE - CONFIG_KCLK_DIS CONFIG_KEEP_SERVERADDR CONFIG_KEYBOARD --CONFIG_KEYSTONE_NAND_MAX_RBL_PAGE --CONFIG_KEYSTONE_NAND_MAX_RBL_SIZE --CONFIG_KEYSTONE_RBL_NAND CONFIG_KEY_REVOCATION --CONFIG_KGDB_BAUDRATE --CONFIG_KGDB_SER_INDEX CONFIG_KIRKWOOD_EGIGA_INIT CONFIG_KIRKWOOD_GPIO CONFIG_KIRKWOOD_PCIE_INIT @@@ -800,32 -707,32 +690,6 @@@ CONFIG_KM_UBI_PARTITION_NAME_BOO CONFIG_KM_UBI_PART_BOOT_OPTS CONFIG_KM_UIMAGE_NAME CONFIG_KM_UPDATE_UBOOT --CONFIG_KSNAV_NETCP_PDMA_CTRL_BASE --CONFIG_KSNAV_NETCP_PDMA_RX_BASE --CONFIG_KSNAV_NETCP_PDMA_RX_CH_NUM --CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_BASE --CONFIG_KSNAV_NETCP_PDMA_RX_FLOW_NUM --CONFIG_KSNAV_NETCP_PDMA_RX_FREE_QUEUE --CONFIG_KSNAV_NETCP_PDMA_RX_RCV_QUEUE --CONFIG_KSNAV_NETCP_PDMA_SCHED_BASE --CONFIG_KSNAV_NETCP_PDMA_TX_BASE --CONFIG_KSNAV_NETCP_PDMA_TX_CH_NUM --CONFIG_KSNAV_NETCP_PDMA_TX_SND_QUEUE --CONFIG_KSNAV_PKTDMA_NETCP --CONFIG_KSNAV_QM_BASE_ADDRESS --CONFIG_KSNAV_QM_CONF_BASE --CONFIG_KSNAV_QM_DESC_SETUP_BASE --CONFIG_KSNAV_QM_INTD_CONF_BASE --CONFIG_KSNAV_QM_LINK_RAM_BASE --CONFIG_KSNAV_QM_MANAGER_QUEUES_BASE --CONFIG_KSNAV_QM_MANAGER_Q_PROXY_BASE --CONFIG_KSNAV_QM_PDSP1_CMD_BASE --CONFIG_KSNAV_QM_PDSP1_CTRL_BASE --CONFIG_KSNAV_QM_PDSP1_IRAM_BASE --CONFIG_KSNAV_QM_QPOOL_NUM --CONFIG_KSNAV_QM_QUEUE_STATUS_BASE --CONFIG_KSNAV_QM_REGION_NUM --CONFIG_KSNAV_QM_STATUS_RAM_BASE CONFIG_KSNET_CPSW_NUM_PORTS CONFIG_KSNET_MAC_ID_BASE CONFIG_KSNET_MDIO_PHY_CONFIG_ENABLE @@@ -895,14 -800,12 +757,10 @@@ CONFIG_M41T94_SPI_C CONFIG_M520x CONFIG_M5301x CONFIG_MACB_SEARCH_PHY --CONFIG_MACH_OMAPL138_LCDK - CONFIG_MACH_TYPE - CONFIG_MACH_TYPE_COMPAT_REV CONFIG_MACRESET_TIMEOUT CONFIG_MALLOC_F_ADDR CONFIG_MALTA CONFIG_MARCO_MEMSET --CONFIG_MARVELL_MFP CONFIG_MASK_AER_AO CONFIG_MAX_DSP_CPUS CONFIG_MAX_FPGA_DEVICES @@@ -945,7 -843,7 +798,6 @@@ CONFIG_MPC83XX_GPIO_0_INIT_VALU CONFIG_MPC83XX_GPIO_1_INIT_DIRECTION CONFIG_MPC83XX_GPIO_1_INIT_OPEN_DRAIN CONFIG_MPC83XX_GPIO_1_INIT_VALUE --CONFIG_MPC83XX_PCI2 CONFIG_MPC85XX_FEC CONFIG_MPC85XX_FEC_NAME CONFIG_MPC8xxx_DISABLE_BPTR @@@ -973,15 -871,15 +825,10 @@@ CONFIG_MV CONFIG_MV_ETH_RXQ CONFIG_MV_I2C_NUM CONFIG_MV_I2C_REG --CONFIG_MX25_CLK32 --CONFIG_MX25_HCLK_FREQ CONFIG_MX27 CONFIG_MX27_CLK32 CONFIG_MX27_TIMER_HIGH_PRECISION CONFIG_MX28_FEC_MAC_IN_OCOTP --CONFIG_MX35 --CONFIG_MX35_CLK32 --CONFIG_MX35_HCLK_FREQ CONFIG_MXC_EPDC CONFIG_MXC_GPT_HCLK CONFIG_MXC_NAND_HWECC @@@ -1046,11 -944,11 +893,6 @@@ CONFIG_NUM_PAM CONFIG_ODROID_REV_AIN CONFIG_OFF_PADCONF CONFIG_OF_ --CONFIG_OMAP_EHCI_PHY1_RESET_GPIO --CONFIG_OMAP_EHCI_PHY2_RESET_GPIO --CONFIG_OMAP_EHCI_PHY3_RESET_GPIO --CONFIG_OMAP_USB2PHY2_HOST --CONFIG_OMAP_USB3PHY1_HOST CONFIG_ORIGEN CONFIG_OTHBOOTARGS CONFIG_OVERWRITE_ETHADDR_ONCE @@@ -1073,7 -969,7 +913,6 @@@ CONFIG_PCIE CONFIG_PCIE_IMX CONFIG_PCIE_IMX_PERST_GPIO CONFIG_PCIE_IMX_POWER_GPIO --CONFIG_PCISLAVE CONFIG_PCI_BOOTDELAY CONFIG_PCI_CLK_FREQ CONFIG_PCI_CONFIG_HOST_BRIDGE @@@ -1110,7 -1007,7 +949,6 @@@ CONFIG_PIXIS_SGMII_CM CONFIG_PL011_CLOCK CONFIG_PL011_SERIAL_RLCR CONFIG_PL01x_PORTS --CONFIG_PLATFORM_ENV_SETTINGS CONFIG_PM CONFIG_PMC_BR_PRELIM CONFIG_PMC_OR_PRELIM @@@ -1169,7 -1063,7 +1004,6 @@@ CONFIG_QSP CONFIG_QUOTA CONFIG_RAMBOOTCOMMAND CONFIG_RAMBOOT_NAND - CONFIG_RAMBOOT_PBL -CONFIG_RAMBOOT_SDCARD CONFIG_RAMBOOT_SPIFLASH CONFIG_RAMBOOT_TEXT_BASE CONFIG_RAMDISKFILE @@@ -1284,7 -1170,7 +1110,6 @@@ CONFIG_SH73A CONFIG_SH7751_PCI CONFIG_SHARP_LM8V31 CONFIG_SHEEVA_88SV131 --CONFIG_SHEEVA_88SV331xV5 CONFIG_SH_CMT_CLK_FREQ CONFIG_SH_DSP CONFIG_SH_ETHER_ALIGNE_SIZE @@@ -1335,11 -1214,11 +1153,6 @@@ CONFIG_SMSTP7_EN CONFIG_SMSTP8_ENA CONFIG_SMSTP9_ENA CONFIG_SOCRATES --CONFIG_SOC_K2E --CONFIG_SOC_K2G --CONFIG_SOC_K2HK --CONFIG_SOC_K2L --CONFIG_SOC_KEYSTONE CONFIG_SOC_OMAP3430 CONFIG_SOFT_I2C_GPIO_SCL CONFIG_SOFT_I2C_GPIO_SDA @@@ -1862,12 -1727,12 +1661,10 @@@ CONFIG_SYS_FLASH CONFIG_SYS_FLASH1_BASE_PHYS CONFIG_SYS_FLASH1_BASE_PHYS_EARLY CONFIG_SYS_FLASHBOOT --CONFIG_SYS_FLASH_ADDR_BASE CONFIG_SYS_FLASH_AMD_CHECK_DQ7 CONFIG_SYS_FLASH_AUTOPROTECT_LIST CONFIG_SYS_FLASH_BANKS_LIST CONFIG_SYS_FLASH_BANKS_SIZES --CONFIG_SYS_FLASH_BANK_SIZE CONFIG_SYS_FLASH_BASE CONFIG_SYS_FLASH_BASE0 CONFIG_SYS_FLASH_BASE1 @@@ -2308,42 -2157,15 +2089,13 @@@ CONFIG_SYS_I2C_EXPANDER_ADD CONFIG_SYS_I2C_FPGA_ADDR CONFIG_SYS_I2C_FRAM CONFIG_SYS_I2C_G762_ADDR -CONFIG_SYS_I2C_IDT6V49205B CONFIG_SYS_I2C_IFDR_DIV - CONFIG_SYS_I2C_IHS_CH0 - CONFIG_SYS_I2C_IHS_CH1 - CONFIG_SYS_I2C_IHS_CH2 - CONFIG_SYS_I2C_IHS_CH3 - CONFIG_SYS_I2C_IHS_DUAL - CONFIG_SYS_I2C_IHS_SLAVE_0 - CONFIG_SYS_I2C_IHS_SLAVE_0_1 - CONFIG_SYS_I2C_IHS_SLAVE_1 - CONFIG_SYS_I2C_IHS_SLAVE_1_1 - CONFIG_SYS_I2C_IHS_SLAVE_2 - CONFIG_SYS_I2C_IHS_SLAVE_2_1 - CONFIG_SYS_I2C_IHS_SLAVE_3 - CONFIG_SYS_I2C_IHS_SLAVE_3_1 - CONFIG_SYS_I2C_IHS_SPEED_0 - CONFIG_SYS_I2C_IHS_SPEED_0_1 - CONFIG_SYS_I2C_IHS_SPEED_1 - CONFIG_SYS_I2C_IHS_SPEED_1_1 - CONFIG_SYS_I2C_IHS_SPEED_2 - CONFIG_SYS_I2C_IHS_SPEED_2_1 - CONFIG_SYS_I2C_IHS_SPEED_3 - CONFIG_SYS_I2C_IHS_SPEED_3_1 CONFIG_SYS_I2C_INIT_BOARD CONFIG_SYS_I2C_LDI_ADDR - CONFIG_SYS_I2C_LEGACY CONFIG_SYS_I2C_LPC32XX_SLAVE CONFIG_SYS_I2C_LPC32XX_SPEED - CONFIG_SYS_I2C_MAC1_BUS - CONFIG_SYS_I2C_MAC1_CHIP_ADDR - CONFIG_SYS_I2C_MAC1_DATA_ADDR - CONFIG_SYS_I2C_MAC2_BUS - CONFIG_SYS_I2C_MAC2_CHIP_ADDR - CONFIG_SYS_I2C_MAC2_DATA_ADDR CONFIG_SYS_I2C_MAX_HOPS -CONFIG_SYS_I2C_NCT72_ADDR CONFIG_SYS_I2C_NOPROBES - CONFIG_SYS_I2C_OFFSET CONFIG_SYS_I2C_PCA953X_ADDR CONFIG_SYS_I2C_PCA953X_WIDTH CONFIG_SYS_I2C_PCA9557_ADDR @@@ -2808,19 -2574,19 +2504,7 @@@ CONFIG_SYS_PCI1_MEM_BU CONFIG_SYS_PCI1_MEM_PHYS CONFIG_SYS_PCI1_MEM_SIZE CONFIG_SYS_PCI1_MEM_VIRT --CONFIG_SYS_PCI1_MMIO_BASE --CONFIG_SYS_PCI1_MMIO_PHYS --CONFIG_SYS_PCI1_MMIO_SIZE CONFIG_SYS_PCI2_ADDR --CONFIG_SYS_PCI2_IO_BASE --CONFIG_SYS_PCI2_IO_PHYS --CONFIG_SYS_PCI2_IO_SIZE --CONFIG_SYS_PCI2_MEM_BASE --CONFIG_SYS_PCI2_MEM_PHYS --CONFIG_SYS_PCI2_MEM_SIZE --CONFIG_SYS_PCI2_MMIO_BASE --CONFIG_SYS_PCI2_MMIO_PHYS --CONFIG_SYS_PCI2_MMIO_SIZE CONFIG_SYS_PCI64_MEMORY_BUS CONFIG_SYS_PCIE CONFIG_SYS_PCIE1_ADDR @@@ -3002,7 -2772,7 +2686,6 @@@ CONFIG_SYS_RCAR_I2C0_BAS CONFIG_SYS_RCAR_I2C1_BASE CONFIG_SYS_RCAR_I2C2_BASE CONFIG_SYS_RCAR_I2C3_BASE --CONFIG_SYS_RCWH_PCIHOST CONFIG_SYS_READ_SPD CONFIG_SYS_RESET_ADDR CONFIG_SYS_RESET_ADDRESS @@@ -3133,8 -2903,8 +2816,6 @@@ CONFIG_SYS_SMC0_PULSE0_VA CONFIG_SYS_SMC0_SETUP0_VAL CONFIG_SYS_SMC_CSR0_VAL CONFIG_SYS_SPCR_OPT --CONFIG_SYS_SPCR_TSEC1EP --CONFIG_SYS_SPCR_TSEC2EP CONFIG_SYS_SPD_BUS_NUM CONFIG_SYS_SPI_ARGS_OFFS CONFIG_SYS_SPI_ARGS_SIZE @@@ -3186,9 -2957,9 +2867,7 @@@ CONFIG_SYS_TMRINTR_PEN CONFIG_SYS_TMRINTR_PRI CONFIG_SYS_TMRPND_REG CONFIG_SYS_TMR_BASE --CONFIG_SYS_TSEC1 CONFIG_SYS_TSEC1_OFFSET --CONFIG_SYS_TSEC2 CONFIG_SYS_TSEC2_OFFSET CONFIG_SYS_TSEC3_OFFSET CONFIG_SYS_TX_ETH_BUFFER @@@ -3231,7 -3002,7 +2910,6 @@@ CONFIG_SYS_USE_DATAFLASH_CS CONFIG_SYS_USE_FLASH CONFIG_SYS_USE_MAIN_OSCILLATOR CONFIG_SYS_USE_MMC --CONFIG_SYS_USE_MPC834XSYS_USB_PHY CONFIG_SYS_USE_NAND CONFIG_SYS_USE_NANDFLASH CONFIG_SYS_USE_NORFLASH @@@ -3298,7 -3067,7 +2974,6 @@@ CONFIG_THOR_RESET_OF CONFIG_THUNDERX CONFIG_TIMESTAMP CONFIG_TIZEN --CONFIG_TI_KSNAV CONFIG_TMU_TIMER CONFIG_TPL_PAD_TO CONFIG_TPM_TIS_BASE_ADDRESS @@@ -3324,9 -3092,11 +2998,8 @@@ CONFIG_UBIFS_VOLUM CONFIG_UBI_PART CONFIG_UBI_SIZE CONFIG_UBOOTPATH --CONFIG_UBOOT_ENABLE_PADS_ALL CONFIG_UBOOT_SECTOR_COUNT CONFIG_UBOOT_SECTOR_START -CONFIG_UCP1020 -CONFIG_UCP1020_REV_1_3 CONFIG_UDP_CHECKSUM CONFIG_UEC_ETH CONFIG_UEC_ETH1 @@@ -3374,7 -3144,7 +3047,6 @@@ CONFIG_USB_EHCI_BASE_LIS CONFIG_USB_EHCI_EXYNOS CONFIG_USB_EHCI_FARADAY CONFIG_USB_EHCI_KIRKWOOD --CONFIG_USB_EHCI_MXC CONFIG_USB_EHCI_MXS CONFIG_USB_EHCI_TXFIFO_THRESH CONFIG_USB_ETH_QMULT @@@ -3413,7 -3183,7 +3085,6 @@@ CONFIG_USB_TT CONFIG_USB_TUSB_OMAP_DMA CONFIG_USB_ULPI_TIMEOUT CONFIG_USB_XHCI_EXYNOS --CONFIG_USB_XHCI_OMAP CONFIG_USER_LOWLEVEL_INIT CONFIG_USE_INTERRUPT CONFIG_USE_ONENAND_BOARD_INIT