Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit d6c2ac5b7572e1fd9662e1cd9c1d7c184dfab1c0

Authored by Masahiro Yamada
Committed by Tom Rini
1 parent 8be60f06c2
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

spl: move SPL driver entries to driver/Makefile 

Just preparing for upcoming cleaning.

The board-specific linker script  board/vpac270/u-boot-spl.lds
has been touched to avoid build error.  It does not change the
size of spl/u-boot-spl.bin for this board, so it should be OK.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Tom Rini <trini@konsulko.com>
Reviewed-by: Stefano Babic <sbabic@denx.de>
Reviewed-by: Simon Glass <sjg@chromium.org>

Showing 3 changed files with 39 additions and 31 deletions Side-by-side Diff

board/vpac270/u-boot-spl.lds
Diff comments   View file @ d6c2ac5
... ... @@ -23,7 +23,7 @@
23 23 arch/arm/cpu/pxa/start.o (.text*)
24 24 arch/arm/lib/built-in.o (.text*)
25 25 board/vpac270/built-in.o (.text*)
26   - drivers/mtd/onenand/built-in.o (.text*)
  26 + drivers/built-in.o (.text*)
27 27 }
28 28  
29 29  
  1 +ifdef CONFIG_SPL_BUILD
  2 +
  3 +obj-$(CONFIG_SPL_CLK_SUPPORT) += clk/
  4 +obj-$(CONFIG_SPL_DM) += core/
  5 +obj-$(CONFIG_SPL_I2C_SUPPORT) += i2c/
  6 +obj-$(CONFIG_SPL_GPIO_SUPPORT) += gpio/
  7 +obj-$(CONFIG_SPL_MMC_SUPPORT) += mmc/
  8 +obj-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += ddr/fsl/
  9 +obj-$(CONFIG_SYS_MVEBU_DDR_A38X) += ddr/marvell/a38x/
  10 +obj-$(CONFIG_SYS_MVEBU_DDR_AXP) += ddr/marvell/axp/
  11 +obj-$(CONFIG_ALTERA_SDRAM) += ddr/altera/
  12 +obj-$(CONFIG_SPL_SERIAL_SUPPORT) += serial/
  13 +obj-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += mtd/spi/
  14 +obj-$(CONFIG_SPL_SPI_SUPPORT) += spi/
  15 +obj-$(CONFIG_SPL_LED_SUPPORT) += led/
  16 +obj-$(CONFIG_SPL_POWER_SUPPORT) += power/ power/pmic/
  17 +obj-$(CONFIG_SPL_POWER_SUPPORT) += power/regulator/
  18 +obj-$(CONFIG_SPL_MTD_SUPPORT) += mtd/
  19 +obj-$(CONFIG_SPL_NAND_SUPPORT) += mtd/nand/
  20 +obj-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += misc/
  21 +obj-$(CONFIG_SPL_ONENAND_SUPPORT) += mtd/onenand/
  22 +obj-$(CONFIG_SPL_DMA_SUPPORT) += dma/
  23 +obj-$(CONFIG_SPL_ETH_SUPPORT) += net/
  24 +obj-$(CONFIG_SPL_ETH_SUPPORT) += net/phy/
  25 +obj-$(CONFIG_SPL_USBETH_SUPPORT) += net/phy/
  26 +obj-$(CONFIG_SPL_RAM_SUPPORT) += ram/
  27 +obj-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += usb/musb-new/
  28 +obj-$(CONFIG_SPL_USBETH_SUPPORT) += usb/gadget/
  29 +obj-$(CONFIG_SPL_WATCHDOG_SUPPORT) += watchdog/
  30 +obj-$(CONFIG_SPL_USB_HOST_SUPPORT) += usb/host/
  31 +obj-$(CONFIG_OMAP_USB_PHY) += usb/phy/
  32 +obj-$(CONFIG_SPL_SATA_SUPPORT) += block/
  33 +
  34 +else
  35 +
1 36 obj-$(CONFIG_CLK) += clk/
2 37 obj-$(CONFIG_DM) += core/
3 38 obj-$(CONFIG_DM_DEMO) += demo/
... ... @@ -27,4 +62,6 @@
27 62 # SOC specific infrastructure drivers.
28 63 obj-y += soc/
29 64 obj-y += thermal/
  65 +
  66 +endif
scripts/Makefile.spl
Diff comments   View file @ d6c2ac5
... ... @@ -54,40 +54,11 @@
54 54 libs-$(CONFIG_SPL_FRAMEWORK) += common/spl/
55 55 libs-$(CONFIG_SPL_LIBCOMMON_SUPPORT) += common/
56 56 libs-$(CONFIG_SPL_LIBDISK_SUPPORT) += disk/
57   -libs-$(CONFIG_SPL_CLK_SUPPORT) += drivers/clk/
58   -libs-$(CONFIG_SPL_DM) += drivers/core/
59   -libs-$(CONFIG_SPL_I2C_SUPPORT) += drivers/i2c/
60   -libs-$(CONFIG_SPL_GPIO_SUPPORT) += drivers/gpio/
61   -libs-$(CONFIG_SPL_MMC_SUPPORT) += drivers/mmc/
62   -libs-$(CONFIG_SPL_MPC8XXX_INIT_DDR_SUPPORT) += drivers/ddr/fsl/
63   -libs-$(CONFIG_SYS_MVEBU_DDR_A38X) += drivers/ddr/marvell/a38x/
64   -libs-$(CONFIG_SYS_MVEBU_DDR_AXP) += drivers/ddr/marvell/axp/
65   -libs-$(CONFIG_ALTERA_SDRAM) += drivers/ddr/altera/
66   -libs-$(CONFIG_SPL_SERIAL_SUPPORT) += drivers/serial/
67   -libs-$(CONFIG_SPL_SPI_FLASH_SUPPORT) += drivers/mtd/spi/
68   -libs-$(CONFIG_SPL_SPI_SUPPORT) += drivers/spi/
  57 +libs-y += drivers/
69 58 libs-y += fs/
70   -libs-$(CONFIG_SPL_LED_SUPPORT) += drivers/led/
71 59 libs-$(CONFIG_SPL_LIBGENERIC_SUPPORT) += lib/
72   -libs-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/ drivers/power/pmic/
73   -libs-$(CONFIG_SPL_POWER_SUPPORT) += drivers/power/regulator/
74   -libs-$(CONFIG_SPL_MTD_SUPPORT) += drivers/mtd/
75   -libs-$(CONFIG_SPL_NAND_SUPPORT) += drivers/mtd/nand/
76   -libs-$(CONFIG_SPL_DRIVERS_MISC_SUPPORT) += drivers/misc/
77   -libs-$(CONFIG_SPL_ONENAND_SUPPORT) += drivers/mtd/onenand/
78   -libs-$(CONFIG_SPL_DMA_SUPPORT) += drivers/dma/
79 60 libs-$(CONFIG_SPL_POST_MEM_SUPPORT) += post/drivers/
80 61 libs-$(CONFIG_SPL_NET_SUPPORT) += net/
81   -libs-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/
82   -libs-$(CONFIG_SPL_ETH_SUPPORT) += drivers/net/phy/
83   -libs-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/net/phy/
84   -libs-$(CONFIG_SPL_RAM_SUPPORT) += drivers/ram/
85   -libs-$(CONFIG_SPL_MUSB_NEW_SUPPORT) += drivers/usb/musb-new/
86   -libs-$(CONFIG_SPL_USBETH_SUPPORT) += drivers/usb/gadget/
87   -libs-$(CONFIG_SPL_WATCHDOG_SUPPORT) += drivers/watchdog/
88   -libs-$(CONFIG_SPL_USB_HOST_SUPPORT) += drivers/usb/host/
89   -libs-$(CONFIG_OMAP_USB_PHY) += drivers/usb/phy/
90   -libs-$(CONFIG_SPL_SATA_SUPPORT) += drivers/block/
91 62  
92 63 head-y := $(addprefix $(obj)/,$(head-y))
93 64 libs-y := $(addprefix $(obj)/,$(libs-y))