Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 48ba1f3c38aebb12e443d5aefd48c5d03283b0c9

Authored by Tom Rini
1 parent 63f881d46a
Exists in smarc_8mq_lf_v2020.04 and in 17 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, pitx_8mp_lf_v2020.04, smarc-8m-android-10.0.0_2.6.0, smarc-8m-android-11.0.0_2.0.0, smarc-8mp-android-11.0.0_2.0.0, smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2019.04_4.19.35_1.1.0, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8mm-imx_v2019.04_4.19.35_1.1.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0, smarc_8mp_lf_v2020.04, smarc_8mq-imx_v2020.04_5.4.24_2.1.0

configs: Resync with savedefconfig 

Rsync all defconfig files using moveconfig.py

Signed-off-by: Tom Rini <trini@konsulko.com>

Showing 13 changed files with 4 additions and 25 deletions Side-by-side Diff

configs/am3517_crane_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -19,7 +19,6 @@
19 19 CONFIG_CMD_USB=y
20 20 # CONFIG_CMD_SETEXPR is not set
21 21 # CONFIG_CMD_NET is not set
22   -CONFIG_CMD_DHCP=y
23 22 CONFIG_CMD_EXT2=y
24 23 CONFIG_CMD_FAT=y
25 24 CONFIG_CMD_JFFS2=y
configs/efi-x86_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -16,7 +16,6 @@
16 16 CONFIG_CMD_SPI=y
17 17 CONFIG_CMD_USB=y
18 18 # CONFIG_CMD_NET is not set
19   -CONFIG_CMD_DHCP=y
20 19 CONFIG_CMD_PING=y
21 20 CONFIG_CMD_TIME=y
22 21 CONFIG_CMD_EXT2=y
configs/imx6qdl_icore_mipi_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -15,11 +15,11 @@
15 15 CONFIG_FIT=y
16 16 CONFIG_FIT_SIGNATURE=y
17 17 CONFIG_FIT_VERBOSE=y
  18 +CONFIG_SPL_LOAD_FIT=y
18 19 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 20 CONFIG_BOOTDELAY=3
20 21 CONFIG_SUPPORT_RAW_INITRD=y
21 22 CONFIG_SPL=y
22   -CONFIG_SPL_LOAD_FIT=y
23 23 CONFIG_SPL_OS_BOOT=y
24 24 CONFIG_HUSH_PARSER=y
25 25 CONFIG_SYS_PROMPT="icorem6qdl-mipi> "
configs/imx6qdl_icore_mmc_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -15,11 +15,11 @@
15 15 CONFIG_FIT=y
16 16 CONFIG_FIT_SIGNATURE=y
17 17 CONFIG_FIT_VERBOSE=y
  18 +CONFIG_SPL_LOAD_FIT=y
18 19 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
19 20 CONFIG_BOOTDELAY=3
20 21 CONFIG_SUPPORT_RAW_INITRD=y
21 22 CONFIG_SPL=y
22   -CONFIG_SPL_LOAD_FIT=y
23 23 CONFIG_SPL_OS_BOOT=y
24 24 CONFIG_HUSH_PARSER=y
25 25 CONFIG_SYS_PROMPT="icorem6qdl> "
configs/imx6qdl_icore_nand_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -33,7 +33,6 @@
33 33 CONFIG_MTDIDS_DEFAULT="nand0=gpmi-nand"
34 34 CONFIG_MTDPARTS_DEFAULT="mtdparts=gpmi-nand:2m(spl),2m(uboot),1m(env),8m(kernel),1m(dtb),-(rootfs)"
35 35 CONFIG_CMD_UBI=y
36   -CONFIG_OF_LIST="imx6q-icore imx6dl-icore"
37 36 CONFIG_ENV_IS_IN_NAND=y
38 37 CONFIG_SYS_I2C_MXC=y
39 38 CONFIG_NAND=y
configs/imx6qdl_icore_rqs_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -14,11 +14,11 @@
14 14 CONFIG_FIT=y
15 15 CONFIG_FIT_SIGNATURE=y
16 16 CONFIG_FIT_VERBOSE=y
  17 +CONFIG_SPL_LOAD_FIT=y
17 18 CONFIG_SYS_EXTRA_OPTIONS="IMX_CONFIG=arch/arm/mach-imx/spl_sd.cfg"
18 19 CONFIG_BOOTDELAY=3
19 20 CONFIG_SUPPORT_RAW_INITRD=y
20 21 CONFIG_SPL=y
21   -CONFIG_SPL_LOAD_FIT=y
22 22 CONFIG_SPL_OS_BOOT=y
23 23 CONFIG_HUSH_PARSER=y
24 24 CONFIG_SYS_PROMPT="icorem6qdl-rqs> "
configs/omap3_pandora_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -31,6 +31,6 @@
31 31 CONFIG_SYS_NS16550=y
32 32 CONFIG_OMAP3_SPI=y
33 33 CONFIG_FAT_WRITE=y
34   -CONFIG_OF_LIBFDT=y
35 34 # CONFIG_REGEX is not set
  35 +CONFIG_OF_LIBFDT=y
configs/thunderx_88xx_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -27,5 +27,4 @@
27 27 CONFIG_DEBUG_UART_BASE=0x87e024000000
28 28 CONFIG_DEBUG_UART_CLOCK=24000000
29 29 CONFIG_DEBUG_UART_SKIP_INIT=y
30   -CONFIG_REGEX=y
configs/vct_platinumavc_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -10,7 +10,6 @@
10 10 CONFIG_CMD_I2C=y
11 11 # CONFIG_CMD_SETEXPR is not set
12 12 # CONFIG_CMD_NET is not set
13   -CONFIG_CMD_DHCP=y
14 13 # CONFIG_CMD_NFS is not set
15 14 # CONFIG_ISO_PARTITION is not set
16 15 CONFIG_ENV_IS_IN_FLASH=y
configs/vct_platinumavc_onenand_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -12,7 +12,6 @@
12 12 CONFIG_CMD_ONENAND=y
13 13 # CONFIG_CMD_SETEXPR is not set
14 14 # CONFIG_CMD_NET is not set
15   -CONFIG_CMD_DHCP=y
16 15 # CONFIG_CMD_NFS is not set
17 16 CONFIG_CMD_JFFS2=y
18 17 CONFIG_MTDIDS_DEFAULT="onenand0=onenand"
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -42,5 +42,4 @@
42 42 CONFIG_DEBUG_UART_CLOCK=50000000
43 43 CONFIG_DEBUG_UART_ANNOUNCE=y
44 44 CONFIG_ZYNQ_SERIAL=y
45   -CONFIG_REGEX=y
configs/zynq_zc770_xm011_x16_defconfig
Diff comments   View file @ 48ba1f3
... ... @@ -43,5 +43,4 @@
43 43 CONFIG_DEBUG_UART_CLOCK=50000000
44 44 CONFIG_DEBUG_UART_ANNOUNCE=y
45 45 CONFIG_ZYNQ_SERIAL=y
46   -CONFIG_REGEX=y
scripts/config_whitelist.txt
Diff comments   View file @ 48ba1f3
... ... @@ -654,9 +654,7 @@
654 654 CONFIG_FORMIKE
655 655 CONFIG_FPGA_COUNT
656 656 CONFIG_FPGA_DELAY
657   -CONFIG_FPGA_SPARTAN3
658 657 CONFIG_FPGA_STRATIX_V
659   -CONFIG_FPGA_ZYNQPL
660 658 CONFIG_FSLDMAFEC
661 659 CONFIG_FSL_CADMUS
662 660 CONFIG_FSL_CORENET
... ... @@ -3278,9 +3276,6 @@
3278 3276 CONFIG_SYS_I2C_TCA642X_BUS_NUM
3279 3277 CONFIG_SYS_I2C_TEGRA
3280 3278 CONFIG_SYS_I2C_W83782G_ADDR
3281   -CONFIG_SYS_I2C_ZYNQ
3282   -CONFIG_SYS_I2C_ZYNQ_SLAVE
3283   -CONFIG_SYS_I2C_ZYNQ_SPEED
3284 3279 CONFIG_SYS_IBAT
3285 3280 CONFIG_SYS_IBAT0L
3286 3281 CONFIG_SYS_IBAT0U
... ... @@ -3515,7 +3510,6 @@
3515 3510 CONFIG_SYS_MEMAC_LITTLE_ENDIAN
3516 3511 CONFIG_SYS_MEMORY_BASE
3517 3512 CONFIG_SYS_MEMORY_SIZE
3518   -CONFIG_SYS_MEMORY_TOP
3519 3513 CONFIG_SYS_MEMTEST_END
3520 3514 CONFIG_SYS_MEMTEST_SCRATCH
3521 3515 CONFIG_SYS_MEMTEST_START
... ... @@ -4389,7 +4383,6 @@
4389 4383 CONFIG_SYS_SXCNFG_VAL
4390 4384 CONFIG_SYS_TBIPA_VALUE
4391 4385 CONFIG_SYS_TCLK
4392   -CONFIG_SYS_TEXT_ADDR
4393 4386 CONFIG_SYS_TEXT_BASE_NOR
4394 4387 CONFIG_SYS_TEXT_BASE_SPL
4395 4388 CONFIG_SYS_TIMERBASE
... ... @@ -4835,7 +4828,6 @@
4835 4828 CONFIG_X86_REFCODE_ADDR
4836 4829 CONFIG_X86_REFCODE_RUN_ADDR
4837 4830 CONFIG_XGI_XG22_BASE
4838   -CONFIG_XILINX_GPIO
4839 4831 CONFIG_XILINX_SPI_IDLE_VAL
4840 4832 CONFIG_XILINX_TB_WATCHDOG
4841 4833 CONFIG_XR16L2751
4842 4834  
4843 4835  
... ... @@ -4859,13 +4851,8 @@
4859 4851 CONFIG_ZYNQ_EEPROM
4860 4852 CONFIG_ZYNQ_EEPROM_BUS
4861 4853 CONFIG_ZYNQ_GEM_EEPROM_ADDR
4862   -CONFIG_ZYNQ_GEM_I2C_MAC_OFFSET
4863 4854 CONFIG_ZYNQ_HISPD_BROKEN
4864   -CONFIG_ZYNQ_I2C0
4865   -CONFIG_ZYNQ_I2C1
4866 4855 CONFIG_ZYNQ_SDHCI0
4867 4856 CONFIG_ZYNQ_SDHCI1
4868   -CONFIG_ZYNQ_SDHCI_MAX_FREQ
4869   -CONFIG_ZYNQ_SDHCI_MIN_FREQ
4870 4857 CONFIG_eTSEC_MDIO_BUS