From ef9574da96f0cb8644c2a211000447cbf625260f Mon Sep 17 00:00:00 2001 From: Tom Rini Date: Fri, 6 Dec 2024 17:40:50 -0600 Subject: [PATCH] configs: Resync with savedefconfig Resync all defconfig files using qconfig.py Signed-off-by: Tom Rini --- configs/bcm947622_defconfig | 3 --- configs/bcm94912_defconfig | 3 --- configs/bcm963146_defconfig | 3 --- configs/bcm963158_defconfig | 3 --- configs/bcm963178_defconfig | 3 --- configs/bcm96756_defconfig | 3 --- configs/bcm96813_defconfig | 3 --- configs/bcm96855_defconfig | 3 --- configs/bcm96856_defconfig | 3 --- configs/bcm96858_defconfig | 3 --- configs/bcm96878_defconfig | 3 --- configs/sifive_unmatched_defconfig | 2 +- configs/starfive_visionfive2_defconfig | 3 --- 13 files changed, 1 insertion(+), 37 deletions(-) diff --git a/configs/bcm947622_defconfig b/configs/bcm947622_defconfig index cf0651c650..566f9f2920 100644 --- a/configs/bcm947622_defconfig +++ b/configs/bcm947622_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm94912_defconfig b/configs/bcm94912_defconfig index bce823b904..46bbfb6798 100644 --- a/configs/bcm94912_defconfig +++ b/configs/bcm94912_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm963146_defconfig b/configs/bcm963146_defconfig index 691d055e31..239a8a10fa 100644 --- a/configs/bcm963146_defconfig +++ b/configs/bcm963146_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm963158_defconfig b/configs/bcm963158_defconfig index 6e4a85ec3a..a6cfea6cd7 100644 --- a/configs/bcm963158_defconfig +++ b/configs/bcm963158_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm963178_defconfig b/configs/bcm963178_defconfig index 60a198719a..95c9c8e396 100644 --- a/configs/bcm963178_defconfig +++ b/configs/bcm963178_defconfig @@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96756_defconfig b/configs/bcm96756_defconfig index 4b1fa991a0..bfd309c25f 100644 --- a/configs/bcm96756_defconfig +++ b/configs/bcm96756_defconfig @@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96813_defconfig b/configs/bcm96813_defconfig index 553bdc148b..7f16523164 100644 --- a/configs/bcm96813_defconfig +++ b/configs/bcm96813_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96855_defconfig b/configs/bcm96855_defconfig index ff6dff0fca..342be0a0e1 100644 --- a/configs/bcm96855_defconfig +++ b/configs/bcm96855_defconfig @@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96856_defconfig b/configs/bcm96856_defconfig index 7c6fba29ab..5f22186966 100644 --- a/configs/bcm96856_defconfig +++ b/configs/bcm96856_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96858_defconfig b/configs/bcm96858_defconfig index 3e11b40126..682cb14e89 100644 --- a/configs/bcm96858_defconfig +++ b/configs/bcm96858_defconfig @@ -18,10 +18,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/bcm96878_defconfig b/configs/bcm96878_defconfig index 52c869aab9..ad65187c30 100644 --- a/configs/bcm96878_defconfig +++ b/configs/bcm96878_defconfig @@ -19,10 +19,7 @@ CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_HUSH_PARSER=y CONFIG_CMD_NAND=y CONFIG_CMD_CACHE=y -CONFIG_OF_CONTROL=y -CONFIG_OF_UPSTREAM=y CONFIG_OF_EMBED=y -CONFIG_DM=y CONFIG_CLK=y CONFIG_MTD=y CONFIG_DM_MTD=y diff --git a/configs/sifive_unmatched_defconfig b/configs/sifive_unmatched_defconfig index 6f511796a2..4fed7eda94 100644 --- a/configs/sifive_unmatched_defconfig +++ b/configs/sifive_unmatched_defconfig @@ -36,7 +36,6 @@ CONFIG_DISPLAY_BOARDINFO=y CONFIG_DISPLAY_BOARDINFO_LATE=y CONFIG_ID_EEPROM=y CONFIG_PCI_INIT_R=y -CONFIG_PCI_REGION_MULTI_ENTRY=y CONFIG_SPL_MAX_SIZE=0x100000 # CONFIG_SPL_SHARES_INIT_SP_ADDR is not set CONFIG_SPL_SYS_MALLOC=y @@ -60,6 +59,7 @@ CONFIG_SYS_I2C_EEPROM_ADDR=0x54 CONFIG_SPI_FLASH_ISSI=y CONFIG_E1000=y CONFIG_NVME_PCI=y +CONFIG_PCI_REGION_MULTI_ENTRY=y CONFIG_PCIE_DW_SIFIVE=y CONFIG_SCSI=y CONFIG_USB=y diff --git a/configs/starfive_visionfive2_defconfig b/configs/starfive_visionfive2_defconfig index 319e1d358a..20f89ae679 100644 --- a/configs/starfive_visionfive2_defconfig +++ b/configs/starfive_visionfive2_defconfig @@ -56,9 +56,6 @@ CONFIG_SPL_PAD_TO=0x0 CONFIG_SPL_SYS_MALLOC=y CONFIG_SPL_HAS_CUSTOM_MALLOC_START=y CONFIG_SPL_CUSTOM_SYS_MALLOC_ADDR=0x80000000 -CONFIG_SPL_SYS_MMCSD_RAW_MODE=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION=0x2 CONFIG_SPL_SYS_MALLOC_SIZE=0x400000 CONFIG_SPL_SYS_MMCSD_RAW_MODE=y CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION=y -- 2.39.5