Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 20d08f59fa7cdde0da1eb7aca7915c91dbdeaf51

Authored by Tom Rini
2 parents 774da4b9aa fc82edd844
Exists in v2017.01-smarct4x and in 30 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_v2017.03_4.9.11_1.0.0_ga, smarc-imx7_v2018.03_4.14.98_2.0.0_ga, smarc-imx_v2017.03_4.9.11_1.0.0_ga, smarc-imx_v2017.03_4.9.88_2.0.0_ga, smarc-imx_v2017.03_o8.1.0_1.3.0_8m, smarc-imx_v2018.03_4.14.78_1.0.0_ga, smarc-n7.1.2_2.0.0-ga, smarc-rel_imx_4.1.15_2.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, smarc_8mq_lf_v2020.04, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc

Merge branch 'master' of git://www.denx.de/git/u-boot-microblaze

Showing 20 changed files Side-by-side Diff

... ... @@ -118,6 +118,7 @@
118 118 select OF_SEPARATE
119 119 select DM
120 120 select DM_SERIAL
  121 + select SPL_DM_SEQ_ALIAS
121 122  
122 123 config TARGET_DEVKIT3250
123 124 bool "Support devkit3250"
configs/socfpga_arria5_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_STACK_R_ADDR=0x00800000
8 8 CONFIG_DEFAULT_DEVICE_TREE="socfpga_arria5_socdk"
9 9 CONFIG_SPL=y
  10 +CONFIG_SPL_DM_SEQ_ALIAS=y
10 11 CONFIG_SPL_STACK_R=y
11 12 # CONFIG_CMD_IMLS is not set
12 13 # CONFIG_CMD_FLASH is not set
configs/socfpga_cyclone5_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_STACK_R_ADDR=0x00800000
8 8 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socdk"
9 9 CONFIG_SPL=y
  10 +CONFIG_SPL_DM_SEQ_ALIAS=y
10 11 CONFIG_SPL_STACK_R=y
11 12 # CONFIG_CMD_IMLS is not set
12 13 # CONFIG_CMD_FLASH is not set
configs/socfpga_sockit_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_STACK_R_ADDR=0x00800000
8 8 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sockit"
9 9 CONFIG_SPL=y
  10 +CONFIG_SPL_DM_SEQ_ALIAS=y
10 11 CONFIG_SPL_STACK_R=y
11 12 # CONFIG_CMD_IMLS is not set
12 13 # CONFIG_CMD_FLASH is not set
configs/socfpga_socrates_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -7,6 +7,7 @@
7 7 CONFIG_SPL_STACK_R_ADDR=0x00800000
8 8 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_socrates"
9 9 CONFIG_SPL=y
  10 +CONFIG_SPL_DM_SEQ_ALIAS=y
10 11 CONFIG_SPL_STACK_R=y
11 12 # CONFIG_CMD_IMLS is not set
12 13 # CONFIG_CMD_FLASH is not set
configs/socfpga_sr1500_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -6,6 +6,7 @@
6 6 CONFIG_TARGET_SOCFPGA_SR1500=y
7 7 CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_sr1500"
8 8 CONFIG_SPL=y
  9 +CONFIG_SPL_DM_SEQ_ALIAS=y
9 10 CONFIG_SPL_STACK_R=y
10 11 CONFIG_SPL_STACK_R_ADDR=0x00800000
11 12 # CONFIG_CMD_IMLS is not set
configs/zynq_microzed_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_CMD_GPIO=y
12 12 # CONFIG_CMD_SETEXPR is not set
13 13 CONFIG_NET_RANDOM_ETHADDR=y
  14 +CONFIG_SPL_DM_SEQ_ALIAS=y
14 15 CONFIG_SPI_FLASH=y
15 16 CONFIG_SPI_FLASH_SPANSION=y
16 17 CONFIG_SPI_FLASH_STMICRO=y
configs/zynq_picozed_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -8,5 +8,6 @@
8 8 CONFIG_CMD_GPIO=y
9 9 # CONFIG_CMD_SETEXPR is not set
10 10 CONFIG_NET_RANDOM_ETHADDR=y
  11 +CONFIG_SPL_DM_SEQ_ALIAS=y
11 12 CONFIG_ZYNQ_GEM=y
configs/zynq_zc702_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -10,6 +10,7 @@
10 10 CONFIG_CMD_GPIO=y
11 11 # CONFIG_CMD_SETEXPR is not set
12 12 CONFIG_NET_RANDOM_ETHADDR=y
  13 +CONFIG_SPL_DM_SEQ_ALIAS=y
13 14 CONFIG_SPI_FLASH=y
14 15 CONFIG_SPI_FLASH_SPANSION=y
15 16 CONFIG_SPI_FLASH_STMICRO=y
configs/zynq_zc706_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_CMD_GPIO=y
12 12 # CONFIG_CMD_SETEXPR is not set
13 13 CONFIG_NET_RANDOM_ETHADDR=y
  14 +CONFIG_SPL_DM_SEQ_ALIAS=y
14 15 CONFIG_SPI_FLASH=y
15 16 CONFIG_SPI_FLASH_SPANSION=y
16 17 CONFIG_SPI_FLASH_STMICRO=y
configs/zynq_zc770_xm010_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -12,6 +12,7 @@
12 12 CONFIG_CMD_GPIO=y
13 13 # CONFIG_CMD_SETEXPR is not set
14 14 CONFIG_NET_RANDOM_ETHADDR=y
  15 +CONFIG_SPL_DM_SEQ_ALIAS=y
15 16 CONFIG_SPI_FLASH=y
16 17 CONFIG_SPI_FLASH_SPANSION=y
17 18 CONFIG_SPI_FLASH_STMICRO=y
configs/zynq_zc770_xm011_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -12,5 +12,6 @@
12 12 CONFIG_CMD_GPIO=y
13 13 # CONFIG_CMD_SETEXPR is not set
14 14 CONFIG_NET_RANDOM_ETHADDR=y
  15 +CONFIG_SPL_DM_SEQ_ALIAS=y
15 16 CONFIG_ZYNQ_GEM=y
configs/zynq_zc770_xm012_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -10,5 +10,6 @@
10 10 CONFIG_CMD_GPIO=y
11 11 # CONFIG_CMD_SETEXPR is not set
12 12 CONFIG_NET_RANDOM_ETHADDR=y
  13 +CONFIG_SPL_DM_SEQ_ALIAS=y
13 14 CONFIG_ZYNQ_GEM=y
configs/zynq_zc770_xm013_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -12,5 +12,6 @@
12 12 CONFIG_CMD_GPIO=y
13 13 # CONFIG_CMD_SETEXPR is not set
14 14 CONFIG_NET_RANDOM_ETHADDR=y
  15 +CONFIG_SPL_DM_SEQ_ALIAS=y
15 16 CONFIG_ZYNQ_GEM=y
configs/zynq_zed_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_CMD_GPIO=y
12 12 # CONFIG_CMD_SETEXPR is not set
13 13 CONFIG_NET_RANDOM_ETHADDR=y
  14 +CONFIG_SPL_DM_SEQ_ALIAS=y
14 15 CONFIG_SPI_FLASH=y
15 16 CONFIG_SPI_FLASH_SPANSION=y
16 17 CONFIG_SPI_FLASH_STMICRO=y
configs/zynq_zybo_defconfig
Diff comments   View file @ 20d08f5
... ... @@ -11,6 +11,7 @@
11 11 CONFIG_CMD_GPIO=y
12 12 # CONFIG_CMD_SETEXPR is not set
13 13 CONFIG_NET_RANDOM_ETHADDR=y
  14 +CONFIG_SPL_DM_SEQ_ALIAS=y
14 15 CONFIG_ZYNQ_GEM=y
15 16 CONFIG_DEBUG_UART=y
16 17 CONFIG_DEBUG_UART_ZYNQ=y
drivers/core/Kconfig
Diff comments   View file @ 20d08f5
... ... @@ -60,6 +60,15 @@
60 60 help
61 61 Most boards will have a '/aliases' node containing the path to
62 62 numbered devices (e.g. serial0 = &serial0). This feature can be
  63 + disabled if it is not required.
  64 +
  65 +config SPL_DM_SEQ_ALIAS
  66 + bool "Support numbered aliases in device tree in SPL"
  67 + depends on DM
  68 + default n
  69 + help
  70 + Most boards will have a '/aliases' node containing the path to
  71 + numbered devices (e.g. serial0 = &serial0). This feature can be
63 72 disabled if it is not required, to save code space in SPL.
64 73  
65 74 config REGMAP
drivers/core/device.c
Diff comments   View file @ 20d08f5
... ... @@ -64,7 +64,7 @@
64 64  
65 65 dev->seq = -1;
66 66 dev->req_seq = -1;
67   - if (CONFIG_IS_ENABLED(OF_CONTROL) && IS_ENABLED(CONFIG_DM_SEQ_ALIAS)) {
  67 + if (CONFIG_IS_ENABLED(OF_CONTROL) && CONFIG_IS_ENABLED(DM_SEQ_ALIAS)) {
68 68 /*
69 69 * Some devices, such as a SPI bus, I2C bus and serial ports
70 70 * are numbered using aliases.
include/config_uncmd_spl.h
Diff comments   View file @ 20d08f5
... ... @@ -29,7 +29,6 @@
29 29 #endif
30 30  
31 31 #undef CONFIG_DM_WARN
32   -#undef CONFIG_DM_SEQ_ALIAS
33 32 #undef CONFIG_DM_STDIO
34 33  
35 34 #endif /* CONFIG_SPL_BUILD */
include/configs/socfpga_common.h
Diff comments   View file @ 20d08f5
... ... @@ -370,7 +370,6 @@
370 370  
371 371 /* SPL QSPI boot support */
372 372 #ifdef CONFIG_SPL_SPI_SUPPORT
373   -#define CONFIG_DM_SEQ_ALIAS 1
374 373 #define CONFIG_SPL_SPI_FLASH_SUPPORT
375 374 #define CONFIG_SPL_SPI_LOAD
376 375 #define CONFIG_SYS_SPI_U_BOOT_OFFS 0x40000