Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1872c67359ca7940e7442384288279811a9019b2

Authored by Simon Glass
Committed by Tom Rini
1 parent fb24112c19
Exists in v2017.01-smarct4x and in 32 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf-6.6.52-2.2.0, emb_lf_v2022.04, emb_lf_v2023.04, emb_lf_v2024.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_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

Allow command-line files to be dropped 

These files do not need to be compiled when CONFIG_CMDLINE is disabled.
Update the Makefile to reflect this.

Signed-off-by: Simon Glass <sjg@chromium.org>
Reviewed-by: Tom Rini <trini@konsulko.com>

Showing 1 changed file with 2 additions and 2 deletions Inline Diff

1 # 1 #
2 # (C) Copyright 2004-2006 2 # (C) Copyright 2004-2006
3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. 3 # Wolfgang Denk, DENX Software Engineering, wd@denx.de.
4 # 4 #
5 # SPDX-License-Identifier: GPL-2.0+ 5 # SPDX-License-Identifier: GPL-2.0+
6 # 6 #
7 7
8 # core 8 # core
9 ifndef CONFIG_SPL_BUILD 9 ifndef CONFIG_SPL_BUILD
10 obj-y += init/ 10 obj-y += init/
11 obj-y += main.o 11 obj-y += main.o
12 obj-y += exports.o 12 obj-y += exports.o
13 obj-y += hash.o 13 obj-y += hash.o
14 ifdef CONFIG_SYS_HUSH_PARSER 14 ifdef CONFIG_SYS_HUSH_PARSER
15 obj-y += cli_hush.o 15 obj-y += cli_hush.o
16 endif 16 endif
17 17
18 # This option is not just y/n - it can have a numeric value 18 # This option is not just y/n - it can have a numeric value
19 ifdef CONFIG_BOOTDELAY 19 ifdef CONFIG_BOOTDELAY
20 obj-y += autoboot.o 20 obj-y += autoboot.o
21 endif 21 endif
22 22
23 # This option is not just y/n - it can have a numeric value 23 # This option is not just y/n - it can have a numeric value
24 ifdef CONFIG_BOOT_RETRY_TIME 24 ifdef CONFIG_BOOT_RETRY_TIME
25 obj-y += bootretry.o 25 obj-y += bootretry.o
26 endif 26 endif
27 27
28 # boards 28 # boards
29 obj-$(CONFIG_SYS_GENERIC_BOARD) += board_f.o 29 obj-$(CONFIG_SYS_GENERIC_BOARD) += board_f.o
30 obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o 30 obj-$(CONFIG_SYS_GENERIC_BOARD) += board_r.o
31 obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o 31 obj-$(CONFIG_DISPLAY_BOARDINFO) += board_info.o
32 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o 32 obj-$(CONFIG_DISPLAY_BOARDINFO_LATE) += board_info.o
33 33
34 obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o 34 obj-$(CONFIG_CMD_BOOTM) += bootm.o bootm_os.o
35 35
36 # environment 36 # environment
37 obj-y += env_attr.o 37 obj-y += env_attr.o
38 obj-y += env_callback.o 38 obj-y += env_callback.o
39 obj-y += env_flags.o 39 obj-y += env_flags.o
40 obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o 40 obj-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
41 obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o 41 obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
42 extra-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o 42 extra-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
43 obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o 43 obj-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
44 extra-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o 44 extra-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
45 obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o 45 obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
46 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o 46 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
47 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o 47 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
48 obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o 48 obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
49 obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o 49 obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o
50 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o 50 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
51 obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o 51 obj-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
52 obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o 52 obj-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
53 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o 53 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
54 obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o 54 obj-$(CONFIG_ENV_IS_IN_REMOTE) += env_remote.o
55 obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o 55 obj-$(CONFIG_ENV_IS_IN_UBI) += env_ubi.o
56 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o 56 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
57 57
58 obj-$(CONFIG_CMD_BEDBUG) += bedbug.o 58 obj-$(CONFIG_CMD_BEDBUG) += bedbug.o
59 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += fdt_support.o 59 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += fdt_support.o
60 60
61 obj-$(CONFIG_MII) += miiphyutil.o 61 obj-$(CONFIG_MII) += miiphyutil.o
62 obj-$(CONFIG_CMD_MII) += miiphyutil.o 62 obj-$(CONFIG_CMD_MII) += miiphyutil.o
63 obj-$(CONFIG_PHYLIB) += miiphyutil.o 63 obj-$(CONFIG_PHYLIB) += miiphyutil.o
64 64
65 ifdef CONFIG_CMD_USB 65 ifdef CONFIG_CMD_USB
66 obj-y += usb.o usb_hub.o 66 obj-y += usb.o usb_hub.o
67 obj-$(CONFIG_USB_STORAGE) += usb_storage.o 67 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
68 endif 68 endif
69 69
70 # others 70 # others
71 obj-$(CONFIG_BOOTSTAGE) += bootstage.o 71 obj-$(CONFIG_BOOTSTAGE) += bootstage.o
72 obj-$(CONFIG_CONSOLE_MUX) += iomux.o 72 obj-$(CONFIG_CONSOLE_MUX) += iomux.o
73 obj-y += flash.o 73 obj-y += flash.o
74 obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o 74 obj-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o
75 obj-$(CONFIG_I2C_EDID) += edid.o 75 obj-$(CONFIG_I2C_EDID) += edid.o
76 obj-$(CONFIG_KALLSYMS) += kallsyms.o 76 obj-$(CONFIG_KALLSYMS) += kallsyms.o
77 obj-y += splash.o 77 obj-y += splash.o
78 obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o 78 obj-$(CONFIG_SPLASH_SOURCE) += splash_source.o
79 ifndef CONFIG_DM_VIDEO 79 ifndef CONFIG_DM_VIDEO
80 obj-$(CONFIG_LCD) += lcd.o lcd_console.o 80 obj-$(CONFIG_LCD) += lcd.o lcd_console.o
81 endif 81 endif
82 obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o 82 obj-$(CONFIG_LCD_ROTATION) += lcd_console_rotation.o
83 obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o 83 obj-$(CONFIG_LCD_DT_SIMPLEFB) += lcd_simplefb.o
84 obj-$(CONFIG_LYNXKDI) += lynxkdi.o 84 obj-$(CONFIG_LYNXKDI) += lynxkdi.o
85 obj-$(CONFIG_MENU) += menu.o 85 obj-$(CONFIG_MENU) += menu.o
86 obj-$(CONFIG_UPDATE_TFTP) += update.o 86 obj-$(CONFIG_UPDATE_TFTP) += update.o
87 obj-$(CONFIG_DFU_TFTP) += update.o 87 obj-$(CONFIG_DFU_TFTP) += update.o
88 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o 88 obj-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
89 89
90 endif # !CONFIG_SPL_BUILD 90 endif # !CONFIG_SPL_BUILD
91 91
92 ifdef CONFIG_SPL_BUILD 92 ifdef CONFIG_SPL_BUILD
93 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o 93 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
94 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o 94 obj-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
95 obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o 95 obj-$(CONFIG_SPL_NET_SUPPORT) += miiphyutil.o
96 obj-$(CONFIG_SPL_OF_TRANSLATE) += fdt_support.o 96 obj-$(CONFIG_SPL_OF_TRANSLATE) += fdt_support.o
97 ifdef CONFIG_SPL_USB_HOST_SUPPORT 97 ifdef CONFIG_SPL_USB_HOST_SUPPORT
98 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o 98 obj-$(CONFIG_SPL_USB_SUPPORT) += usb.o usb_hub.o
99 obj-$(CONFIG_USB_STORAGE) += usb_storage.o 99 obj-$(CONFIG_USB_STORAGE) += usb_storage.o
100 endif 100 endif
101 # environment 101 # environment
102 ifdef CONFIG_SPL_ENV_SUPPORT 102 ifdef CONFIG_SPL_ENV_SUPPORT
103 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o 103 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_attr.o
104 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o 104 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_flags.o
105 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o 105 obj-$(CONFIG_SPL_ENV_SUPPORT) += env_callback.o
106 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o 106 obj-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
107 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o 107 obj-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
108 obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o 108 obj-$(CONFIG_ENV_IS_IN_FAT) += env_fat.o
109 obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o 109 obj-$(CONFIG_ENV_IS_IN_EXT4) += env_ext4.o
110 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o 110 obj-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
111 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o 111 obj-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
112 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o 112 obj-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
113 endif 113 endif
114 endif 114 endif
115 #environment 115 #environment
116 obj-y += env_common.o 116 obj-y += env_common.o
117 #others 117 #others
118 obj-$(CONFIG_DDR_SPD) += ddr_spd.o 118 obj-$(CONFIG_DDR_SPD) += ddr_spd.o
119 obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o 119 obj-$(CONFIG_SPD_EEPROM) += ddr_spd.o
120 obj-$(CONFIG_HWCONFIG) += hwconfig.o 120 obj-$(CONFIG_HWCONFIG) += hwconfig.o
121 obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o 121 obj-$(CONFIG_BOUNCE_BUFFER) += bouncebuf.o
122 ifdef CONFIG_SPL_BUILD 122 ifdef CONFIG_SPL_BUILD
123 obj-$(CONFIG_SPL_SERIAL_SUPPORT) += console.o 123 obj-$(CONFIG_SPL_SERIAL_SUPPORT) += console.o
124 else 124 else
125 obj-y += console.o 125 obj-y += console.o
126 endif 126 endif
127 obj-$(CONFIG_CROS_EC) += cros_ec.o 127 obj-$(CONFIG_CROS_EC) += cros_ec.o
128 obj-y += dlmalloc.o 128 obj-y += dlmalloc.o
129 ifdef CONFIG_SYS_MALLOC_F_LEN 129 ifdef CONFIG_SYS_MALLOC_F_LEN
130 obj-y += malloc_simple.o 130 obj-y += malloc_simple.o
131 endif 131 endif
132 obj-y += image.o 132 obj-y += image.o
133 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o 133 obj-$(CONFIG_ANDROID_BOOT_IMAGE) += image-android.o
134 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += image-fdt.o 134 obj-$(CONFIG_$(SPL_)OF_LIBFDT) += image-fdt.o
135 obj-$(CONFIG_$(SPL_)FIT) += image-fit.o 135 obj-$(CONFIG_$(SPL_)FIT) += image-fit.o
136 obj-$(CONFIG_$(SPL_)FIT_SIGNATURE) += image-sig.o 136 obj-$(CONFIG_$(SPL_)FIT_SIGNATURE) += image-sig.o
137 obj-$(CONFIG_IO_TRACE) += iotrace.o 137 obj-$(CONFIG_IO_TRACE) += iotrace.o
138 obj-y += memsize.o 138 obj-y += memsize.o
139 obj-y += stdio.o 139 obj-y += stdio.o
140 140
141 # This option is not just y/n - it can have a numeric value 141 # This option is not just y/n - it can have a numeric value
142 ifdef CONFIG_FASTBOOT_FLASH 142 ifdef CONFIG_FASTBOOT_FLASH
143 obj-y += image-sparse.o 143 obj-y += image-sparse.o
144 ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV 144 ifdef CONFIG_FASTBOOT_FLASH_MMC_DEV
145 obj-y += fb_mmc.o 145 obj-y += fb_mmc.o
146 endif 146 endif
147 ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV 147 ifdef CONFIG_FASTBOOT_FLASH_NAND_DEV
148 obj-y += fb_nand.o 148 obj-y += fb_nand.o
149 endif 149 endif
150 endif 150 endif
151 151
152 # We always have this since drivers/ddr/fs/interactive.c needs it 152 # We always have this since drivers/ddr/fs/interactive.c needs it
153 obj-y += cli_simple.o 153 obj-$(CONFIG_CMDLINE) += cli_simple.o
154 154
155 obj-y += cli.o 155 obj-y += cli.o
156 obj-y += cli_readline.o 156 obj-$(CONFIG_CMDLINE) += cli_readline.o
157 obj-y += command.o 157 obj-y += command.o
158 obj-y += s_record.o 158 obj-y += s_record.o
159 obj-y += xyzModem.o 159 obj-y += xyzModem.o
160 160
161 CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null) 161 CFLAGS_env_embedded.o := -Wa,--no-warn -DENV_CRC=$(shell tools/envcrc 2>/dev/null)
162 162