Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit aef44283ac8e4d150f9faa87e16d9b962fc7ef5d

Authored by Simon Goldschmidt
Committed by Marek Vasut
1 parent 4399e48deb
Exists in smarc_8mq_lf_v2020.04 and in 9 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_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

arm: socfpga: imply/default common config options 

This commit moves common config options used in all socfpga boards
to select/imply in Kconfig. This both cleans up the defconfig files
as well as makes future changes easier.

Options implied/defaulted for all sub-arches:
- SPL, SPL_DM, USE_TINY_PRINTF, NR_DRAM_BANKS

Options implied/defaulted for implied for A10 & gen5:
- FPGA_SOCFPGA, SYS_MALLOC_F_LEN, SYS_TEXT_BASE

Options implied/defaulted for gen5:
- SPL_STACK_R, SPL_SYS_MALLOC_SIMPLE, SPL_STACK_R_ADDR

Signed-off-by: Simon Goldschmidt <simon.k.r.goldschmidt@gmail.com>
Acked-by: Marek Vasut <marex@denx.de>

Showing 15 changed files with 22 additions and 116 deletions Side-by-side Diff

... ... @@ -839,6 +839,8 @@
839 839 imply DM_SPI
840 840 imply DM_SPI_FLASH
841 841 imply FAT_WRITE
  842 + imply SPL
  843 + imply SPL_DM
842 844 imply SPL_LIBDISK_SUPPORT
843 845 imply SPL_MMC_SUPPORT
844 846 imply SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION
arch/arm/mach-socfpga/Kconfig
Diff comments   View file @ aef4428
1 1 if ARCH_SOCFPGA
2 2  
  3 +config NR_DRAM_BANKS
  4 + default 1
  5 +
  6 +config SPL_STACK_R_ADDR
  7 + default 0x00800000 if TARGET_SOCFPGA_GEN5
  8 +
3 9 config SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE
4 10 default 0xa2
5 11  
  12 +config SYS_MALLOC_F_LEN
  13 + default 0x2000 if TARGET_SOCFPGA_ARRIA10
  14 + default 0x2000 if TARGET_SOCFPGA_GEN5
  15 +
  16 +config SYS_TEXT_BASE
  17 + default 0x01000040 if TARGET_SOCFPGA_ARRIA10
  18 + default 0x01000040 if TARGET_SOCFPGA_GEN5
  19 +
6 20 config TARGET_SOCFPGA_ARRIA5
7 21 bool
8 22 select TARGET_SOCFPGA_GEN5
... ... @@ -21,6 +35,8 @@
21 35 select SYSCON
22 36 select SPL_SYSCON if SPL
23 37 select ETH_DESIGNWARE_SOCFPGA
  38 + imply FPGA_SOCFPGA
  39 + imply USE_TINY_PRINTF
24 40  
25 41 config TARGET_SOCFPGA_CYCLONE5
26 42 bool
... ... @@ -29,6 +45,10 @@
29 45 config TARGET_SOCFPGA_GEN5
30 46 bool
31 47 select ALTERA_SDRAM
  48 + imply FPGA_SOCFPGA
  49 + imply SPL_STACK_R
  50 + imply SPL_SYS_MALLOC_SIMPLE
  51 + imply USE_TINY_PRINTF
32 52  
33 53 config TARGET_SOCFPGA_STRATIX10
34 54 bool
configs/socfpga_arria10_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4 3 CONFIG_SYS_MALLOC_F_LEN=0x2000
5 4 CONFIG_TARGET_SOCFPGA_ARRIA10_SOCDK=y
6   -CONFIG_SPL=y
7 5 CONFIG_IDENT_STRING="socfpga_arria10"
8 6 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 7 CONFIG_USE_BOOTARGS=y
11 8 CONFIG_BOOTARGS="console=ttyS0,115200"
12 9 # CONFIG_USE_BOOTCOMMAND is not set
13 10  
... ... @@ -28,9 +25,7 @@
28 25 # CONFIG_EFI_PARTITION is not set
29 26 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria10_socdk_sdmmc"
30 27 CONFIG_ENV_IS_IN_MMC=y
31   -CONFIG_SPL_DM=y
32 28 CONFIG_SPL_DM_SEQ_ALIAS=y
33   -CONFIG_FPGA_SOCFPGA=y
34 29 CONFIG_DM_GPIO=y
35 30 CONFIG_DWAPB_GPIO=y
36 31 CONFIG_DM_MMC=y
... ... @@ -42,5 +37,4 @@
42 37 CONFIG_TIMER=y
43 38 CONFIG_SPL_TIMER=y
44 39 CONFIG_DESIGNWARE_APB_TIMER=y
45   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_arria5_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_ARRIA5_SOCDK=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -16,8 +11,6 @@
16 11 CONFIG_VERSION_VARIABLE=y
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
20   -CONFIG_SPL_STACK_R=y
21 14 CONFIG_SPL_SPI_LOAD=y
22 15 CONFIG_CMD_ASKENV=y
23 16 CONFIG_CMD_GREPENV=y
24 17  
... ... @@ -39,10 +32,8 @@
39 32 # CONFIG_EFI_PARTITION is not set
40 33 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
41 34 CONFIG_ENV_IS_IN_MMC=y
42   -CONFIG_SPL_DM=y
43 35 CONFIG_SPL_DM_SEQ_ALIAS=y
44 36 CONFIG_DFU_MMC=y
45   -CONFIG_FPGA_SOCFPGA=y
46 37 CONFIG_DM_GPIO=y
47 38 CONFIG_DWAPB_GPIO=y
48 39 CONFIG_DM_I2C=y
... ... @@ -72,5 +63,4 @@
72 63 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
73 64 CONFIG_USB_GADGET_DWC2_OTG=y
74 65 CONFIG_USB_GADGET_DOWNLOAD=y
75   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_cyclone5_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_CYCLONE5_SOCDK=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -16,8 +11,6 @@
16 11 CONFIG_VERSION_VARIABLE=y
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
20   -CONFIG_SPL_STACK_R=y
21 14 CONFIG_SPL_SPI_LOAD=y
22 15 CONFIG_CMD_ASKENV=y
23 16 CONFIG_CMD_GREPENV=y
24 17  
... ... @@ -39,10 +32,8 @@
39 32 # CONFIG_EFI_PARTITION is not set
40 33 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
41 34 CONFIG_ENV_IS_IN_MMC=y
42   -CONFIG_SPL_DM=y
43 35 CONFIG_SPL_DM_SEQ_ALIAS=y
44 36 CONFIG_DFU_MMC=y
45   -CONFIG_FPGA_SOCFPGA=y
46 37 CONFIG_DM_GPIO=y
47 38 CONFIG_DWAPB_GPIO=y
48 39 CONFIG_DM_I2C=y
... ... @@ -73,5 +64,4 @@
73 64 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
74 65 CONFIG_USB_GADGET_DWC2_OTG=y
75 66 CONFIG_USB_GADGET_DOWNLOAD=y
76   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_dbm_soc1_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_DEVBOARDS_DBM_SOC1=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8   -CONFIG_NR_DRAM_BANKS=1
9 4 CONFIG_FIT=y
10 5 CONFIG_USE_BOOTARGS=y
11 6 CONFIG_BOOTARGS="console=ttyS0,115200"
... ... @@ -15,8 +10,6 @@
15 10 CONFIG_VERSION_VARIABLE=y
16 11 # CONFIG_DISPLAY_BOARDINFO is not set
17 12 CONFIG_DISPLAY_BOARDINFO_LATE=y
18   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
19   -CONFIG_SPL_STACK_R=y
20 13 CONFIG_SPL_SPI_LOAD=y
21 14 CONFIG_HUSH_PARSER=y
22 15 CONFIG_CMD_BOOTZ=y
23 16  
... ... @@ -41,9 +34,7 @@
41 34 CONFIG_CMD_FS_GENERIC=y
42 35 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_dbm_soc1"
43 36 CONFIG_ENV_IS_IN_MMC=y
44   -CONFIG_SPL_DM=y
45 37 CONFIG_DFU_MMC=y
46   -CONFIG_FPGA_SOCFPGA=y
47 38 CONFIG_DM_GPIO=y
48 39 CONFIG_DWAPB_GPIO=y
49 40 CONFIG_DM_I2C=y
... ... @@ -67,5 +58,4 @@
67 58 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
68 59 CONFIG_USB_GADGET_DWC2_OTG=y
69 60 CONFIG_USB_GADGET_DOWNLOAD=y
70   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_de0_nano_soc_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -17,8 +12,6 @@
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19 14 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
20   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
21   -CONFIG_SPL_STACK_R=y
22 15 CONFIG_SPL_SPI_LOAD=y
23 16 CONFIG_CMD_ASKENV=y
24 17 CONFIG_CMD_GREPENV=y
25 18  
... ... @@ -40,9 +33,7 @@
40 33 # CONFIG_EFI_PARTITION is not set
41 34 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
42 35 CONFIG_ENV_IS_IN_MMC=y
43   -CONFIG_SPL_DM=y
44 36 CONFIG_DFU_MMC=y
45   -CONFIG_FPGA_SOCFPGA=y
46 37 CONFIG_DM_GPIO=y
47 38 CONFIG_DWAPB_GPIO=y
48 39 CONFIG_DM_I2C=y
... ... @@ -68,5 +59,4 @@
68 59 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
69 60 CONFIG_USB_GADGET_DWC2_OTG=y
70 61 CONFIG_USB_GADGET_DOWNLOAD=y
71   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_de10_nano_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_TERASIC_DE10_NANO=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -16,8 +11,6 @@
16 11 CONFIG_VERSION_VARIABLE=y
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
20   -CONFIG_SPL_STACK_R=y
21 14 CONFIG_SPL_SPI_LOAD=y
22 15 CONFIG_CMD_ASKENV=y
23 16 CONFIG_CMD_GREPENV=y
24 17  
... ... @@ -36,9 +29,7 @@
36 29 # CONFIG_EFI_PARTITION is not set
37 30 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de10_nano"
38 31 CONFIG_ENV_IS_IN_MMC=y
39   -CONFIG_SPL_DM=y
40 32 CONFIG_DFU_MMC=y
41   -CONFIG_FPGA_SOCFPGA=y
42 33 CONFIG_DM_GPIO=y
43 34 CONFIG_DWAPB_GPIO=y
44 35 CONFIG_DM_I2C=y
... ... @@ -64,5 +55,4 @@
64 55 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
65 56 CONFIG_USB_GADGET_DWC2_OTG=y
66 57 CONFIG_USB_GADGET_DOWNLOAD=y
67   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_de1_soc_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_TERASIC_DE1_SOC=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -17,8 +12,6 @@
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19 14 # CONFIG_SPL_RAW_IMAGE_SUPPORT is not set
20   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
21   -CONFIG_SPL_STACK_R=y
22 15 CONFIG_SPL_YMODEM_SUPPORT=y
23 16 CONFIG_CMD_ASKENV=y
24 17 CONFIG_CMD_GREPENV=y
... ... @@ -36,8 +29,6 @@
36 29 # CONFIG_EFI_PARTITION is not set
37 30 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de1_soc"
38 31 CONFIG_ENV_IS_IN_MMC=y
39   -CONFIG_SPL_DM=y
40   -CONFIG_FPGA_SOCFPGA=y
41 32 CONFIG_DM_GPIO=y
42 33 CONFIG_DWAPB_GPIO=y
43 34 CONFIG_DM_I2C=y
... ... @@ -55,6 +46,5 @@
55 46 CONFIG_USB=y
56 47 CONFIG_DM_USB=y
57 48 CONFIG_USB_DWC2=y
58   -CONFIG_USE_TINY_PRINTF=y
59 49 # CONFIG_EFI_LOADER is not set
configs/socfpga_is1_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_IS1=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 CONFIG_USE_BOOTARGS=y
12 7 CONFIG_BOOTARGS="console=ttyS0,115200"
... ... @@ -17,7 +12,6 @@
17 12 CONFIG_VERSION_VARIABLE=y
18 13 # CONFIG_DISPLAY_BOARDINFO is not set
19 14 CONFIG_DISPLAY_BOARDINFO_LATE=y
20   -CONFIG_SPL_STACK_R=y
21 15 CONFIG_SPL_SPI_LOAD=y
22 16 CONFIG_CMD_ASKENV=y
23 17 CONFIG_CMD_GREPENV=y
24 18  
... ... @@ -36,11 +30,9 @@
36 30 # CONFIG_EFI_PARTITION is not set
37 31 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_is1"
38 32 CONFIG_ENV_IS_IN_SPI_FLASH=y
39   -CONFIG_SPL_DM=y
40 33 CONFIG_SPL_DM_SEQ_ALIAS=y
41 34 CONFIG_BOOTCOUNT_LIMIT=y
42 35 CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
43   -CONFIG_FPGA_SOCFPGA=y
44 36 CONFIG_DM_GPIO=y
45 37 CONFIG_DWAPB_GPIO=y
46 38 CONFIG_DM_I2C=y
configs/socfpga_sockit_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_TERASIC_SOCKIT=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -16,8 +11,6 @@
16 11 CONFIG_VERSION_VARIABLE=y
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
20   -CONFIG_SPL_STACK_R=y
21 14 CONFIG_SPL_SPI_LOAD=y
22 15 CONFIG_CMD_ASKENV=y
23 16 CONFIG_CMD_GREPENV=y
24 17  
... ... @@ -39,10 +32,8 @@
39 32 # CONFIG_EFI_PARTITION is not set
40 33 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
41 34 CONFIG_ENV_IS_IN_MMC=y
42   -CONFIG_SPL_DM=y
43 35 CONFIG_SPL_DM_SEQ_ALIAS=y
44 36 CONFIG_DFU_MMC=y
45   -CONFIG_FPGA_SOCFPGA=y
46 37 CONFIG_DM_GPIO=y
47 38 CONFIG_DWAPB_GPIO=y
48 39 CONFIG_DM_I2C=y
... ... @@ -73,5 +64,4 @@
73 64 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
74 65 CONFIG_USB_GADGET_DWC2_OTG=y
75 66 CONFIG_USB_GADGET_DOWNLOAD=y
76   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_socrates_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_EBV_SOCRATES=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -16,8 +11,6 @@
16 11 CONFIG_VERSION_VARIABLE=y
17 12 # CONFIG_DISPLAY_BOARDINFO is not set
18 13 CONFIG_DISPLAY_BOARDINFO_LATE=y
19   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
20   -CONFIG_SPL_STACK_R=y
21 14 CONFIG_SPL_SPI_LOAD=y
22 15 CONFIG_CMD_ASKENV=y
23 16 CONFIG_CMD_GREPENV=y
24 17  
... ... @@ -40,10 +33,8 @@
40 33 # CONFIG_EFI_PARTITION is not set
41 34 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
42 35 CONFIG_ENV_IS_IN_MMC=y
43   -CONFIG_SPL_DM=y
44 36 CONFIG_SPL_DM_SEQ_ALIAS=y
45 37 CONFIG_DFU_MMC=y
46   -CONFIG_FPGA_SOCFPGA=y
47 38 CONFIG_DM_GPIO=y
48 39 CONFIG_DWAPB_GPIO=y
49 40 CONFIG_DM_I2C=y
... ... @@ -75,5 +66,4 @@
75 66 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
76 67 CONFIG_USB_GADGET_DWC2_OTG=y
77 68 CONFIG_USB_GADGET_DOWNLOAD=y
78   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_sr1500_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_SR1500=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 # CONFIG_USE_BOOTCOMMAND is not set
12 7 CONFIG_SYS_CONSOLE_IS_IN_ENV=y
... ... @@ -18,8 +13,6 @@
18 13 # CONFIG_DISPLAY_BOARDINFO is not set
19 14 CONFIG_DISPLAY_BOARDINFO_LATE=y
20 15 CONFIG_BOARD_EARLY_INIT_F=y
21   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
22   -CONFIG_SPL_STACK_R=y
23 16 CONFIG_SPL_SPI_LOAD=y
24 17 CONFIG_CMD_ASKENV=y
25 18 CONFIG_CMD_GREPENV=y
26 19  
... ... @@ -40,11 +33,9 @@
40 33 # CONFIG_EFI_PARTITION is not set
41 34 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
42 35 CONFIG_ENV_IS_IN_SPI_FLASH=y
43   -CONFIG_SPL_DM=y
44 36 CONFIG_SPL_DM_SEQ_ALIAS=y
45 37 CONFIG_BOOTCOUNT_LIMIT=y
46 38 CONFIG_SYS_BOOTCOUNT_ADDR=0xfffffff8
47   -CONFIG_FPGA_SOCFPGA=y
48 39 CONFIG_DM_GPIO=y
49 40 CONFIG_DWAPB_GPIO=y
50 41 CONFIG_DM_I2C=y
... ... @@ -64,5 +55,4 @@
64 55 CONFIG_DM_RESET=y
65 56 CONFIG_SPI=y
66 57 CONFIG_CADENCE_QSPI=y
67   -CONFIG_USE_TINY_PRINTF=y
configs/socfpga_stratix10_defconfig
Diff comments   View file @ aef4428
... ... @@ -3,7 +3,6 @@
3 3 CONFIG_SYS_TEXT_BASE=0x1000
4 4 CONFIG_SYS_MALLOC_F_LEN=0x2000
5 5 CONFIG_TARGET_SOCFPGA_STRATIX10_SOCDK=y
6   -CONFIG_SPL=y
7 6 CONFIG_IDENT_STRING="socfpga_stratix10"
8 7 CONFIG_SPL_FS_FAT=y
9 8 CONFIG_NR_DRAM_BANKS=2
... ... @@ -30,7 +29,6 @@
30 29 CONFIG_DEFAULT_DEVICE_TREE="socfpga_stratix10_socdk"
31 30 CONFIG_ENV_IS_IN_MMC=y
32 31 CONFIG_NET_RANDOM_ETHADDR=y
33   -CONFIG_SPL_DM=y
34 32 CONFIG_SPL_DM_SEQ_ALIAS=y
35 33 CONFIG_DM_GPIO=y
36 34 CONFIG_DWAPB_GPIO=y
configs/socfpga_vining_fpga_defconfig
Diff comments   View file @ aef4428
1 1 CONFIG_ARM=y
2 2 CONFIG_ARCH_SOCFPGA=y
3   -CONFIG_SYS_TEXT_BASE=0x01000040
4   -CONFIG_SYS_MALLOC_F_LEN=0x2000
5 3 CONFIG_TARGET_SOCFPGA_SAMTEC_VINING_FPGA=y
6   -CONFIG_SPL=y
7   -CONFIG_SPL_STACK_R_ADDR=0x00800000
8 4 CONFIG_DISTRO_DEFAULTS=y
9   -CONFIG_NR_DRAM_BANKS=1
10 5 CONFIG_FIT=y
11 6 CONFIG_BOOTDELAY=5
12 7 CONFIG_USE_BOOTARGS=y
... ... @@ -19,8 +14,6 @@
19 14 CONFIG_VERSION_VARIABLE=y
20 15 # CONFIG_DISPLAY_BOARDINFO is not set
21 16 CONFIG_DISPLAY_BOARDINFO_LATE=y
22   -CONFIG_SPL_SYS_MALLOC_SIMPLE=y
23   -CONFIG_SPL_STACK_R=y
24 17 CONFIG_SPL_SPI_LOAD=y
25 18 CONFIG_CMD_ASKENV=y
26 19 CONFIG_CMD_GREPENV=y
27 20  
... ... @@ -45,12 +38,10 @@
45 38 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_vining_fpga"
46 39 CONFIG_ENV_IS_IN_SPI_FLASH=y
47 40 CONFIG_NET_RANDOM_ETHADDR=y
48   -CONFIG_SPL_DM=y
49 41 CONFIG_SPL_DM_SEQ_ALIAS=y
50 42 CONFIG_DFU_MMC=y
51 43 CONFIG_DFU_RAM=y
52 44 CONFIG_DFU_SF=y
53   -CONFIG_FPGA_SOCFPGA=y
54 45 CONFIG_DM_GPIO=y
55 46 CONFIG_DWAPB_GPIO=y
56 47 CONFIG_LED_STATUS=y
... ... @@ -90,5 +81,4 @@
90 81 CONFIG_USB_GADGET_PRODUCT_NUM=0xa4a5
91 82 CONFIG_USB_GADGET_DWC2_OTG=y
92 83 CONFIG_USB_GADGET_DOWNLOAD=y
93   -CONFIG_USE_TINY_PRINTF=y