Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 1648a37505e84fc4e5268b026c3f1db862107e00

Authored by Simon Schwarz
Committed by Albert ARIBAUD
1 parent 19db9be4aa
Exists in master and in 54 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, imx_v2015.04_4.1.15_1.0.0_ga, 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-emmc-imx_v2014.04_3.10.53_1.1.0_ga, smarc-emmc-imx_v2014.04_3.14.28_1.0.0_ga, smarc-imx-l5.0.0_1.0.0-ga, 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_v2014.04_3.14.28_1.0.0_ga, smarc-imx_v2015.04_4.1.15_1.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-m6.0.1_2.1.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, ti-u-boot-2015.07, u-boot-2013.01.y, v2013.10, v2013.10-smarct33, v2013.10-smartmen, v2014.01, v2014.04, v2014.04-smarct33, v2014.04-smarct33-emmc, v2014.04-smartmen, v2014.07, v2014.07-smarct33, v2014.07-smartmen, v2015.07-smarct33, v2015.07-smarct33-emmc, v2015.07-smarct4x, v2016.05-dlt, v2016.05-smarct3x, v2016.05-smarct3x-emmc, v2016.05-smarct4x, v2017.01-smarct3x, v2017.01-smarct3x-emmc, v2017.01-smarct4x

Add cmd_spl command 

This adds a spl command to the u-boot.

Related config:
CONFIG_CMD_SPL
	activate/deactivate the command
CONFIG_CMD_SPL_NAND_OFS
	Offset in NAND to use

Signed-off-by: Simon Schwarz <simonschwarzcor@gmail.com>
Signed-off-by: Stefano Babic <sbabic@denx.de>
CC: Tom Rini <tom.rini@gmail.com>
CC: Wolfgang Denk <wd@denx.de>

Showing 5 changed files with 253 additions and 0 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 # See file CREDITS for list of people who contributed to this 5 # See file CREDITS for list of people who contributed to this
6 # project. 6 # project.
7 # 7 #
8 # This program is free software; you can redistribute it and/or 8 # This program is free software; you can redistribute it and/or
9 # modify it under the terms of the GNU General Public License as 9 # modify it under the terms of the GNU General Public License as
10 # published by the Free Software Foundation; either version 2 of 10 # published by the Free Software Foundation; either version 2 of
11 # the License, or (at your option) any later version. 11 # the License, or (at your option) any later version.
12 # 12 #
13 # This program is distributed in the hope that it will be useful, 13 # This program is distributed in the hope that it will be useful,
14 # but WITHOUT ANY WARRANTY; without even the implied warranty of 14 # but WITHOUT ANY WARRANTY; without even the implied warranty of
15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 15 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 # GNU General Public License for more details. 16 # GNU General Public License for more details.
17 # 17 #
18 # You should have received a copy of the GNU General Public License 18 # You should have received a copy of the GNU General Public License
19 # along with this program; if not, write to the Free Software 19 # along with this program; if not, write to the Free Software
20 # Foundation, Inc., 59 Temple Place, Suite 330, Boston, 20 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21 # MA 02111-1307 USA 21 # MA 02111-1307 USA
22 # 22 #
23 23
24 include $(TOPDIR)/config.mk 24 include $(TOPDIR)/config.mk
25 25
26 LIB = $(obj)libcommon.o 26 LIB = $(obj)libcommon.o
27 27
28 # core 28 # core
29 ifndef CONFIG_SPL_BUILD 29 ifndef CONFIG_SPL_BUILD
30 COBJS-y += main.o 30 COBJS-y += main.o
31 COBJS-y += command.o 31 COBJS-y += command.o
32 COBJS-y += exports.o 32 COBJS-y += exports.o
33 COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o 33 COBJS-$(CONFIG_SYS_HUSH_PARSER) += hush.o
34 COBJS-y += image.o 34 COBJS-y += image.o
35 COBJS-y += s_record.o 35 COBJS-y += s_record.o
36 COBJS-$(CONFIG_SERIAL_MULTI) += serial.o 36 COBJS-$(CONFIG_SERIAL_MULTI) += serial.o
37 COBJS-y += xyzModem.o 37 COBJS-y += xyzModem.o
38 38
39 # core command 39 # core command
40 COBJS-y += cmd_boot.o 40 COBJS-y += cmd_boot.o
41 COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o 41 COBJS-$(CONFIG_CMD_BOOTM) += cmd_bootm.o
42 COBJS-y += cmd_help.o 42 COBJS-y += cmd_help.o
43 COBJS-y += cmd_nvedit.o 43 COBJS-y += cmd_nvedit.o
44 COBJS-y += cmd_version.o 44 COBJS-y += cmd_version.o
45 45
46 # environment 46 # environment
47 COBJS-y += env_common.o 47 COBJS-y += env_common.o
48 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o 48 COBJS-$(CONFIG_ENV_IS_IN_DATAFLASH) += env_dataflash.o
49 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o 49 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_eeprom.o
50 XCOBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o 50 XCOBJS-$(CONFIG_ENV_IS_EMBEDDED) += env_embedded.o
51 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o 51 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += env_embedded.o
52 XCOBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o 52 XCOBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_embedded.o
53 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o 53 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_embedded.o
54 COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o 54 COBJS-$(CONFIG_ENV_IS_IN_FLASH) += env_flash.o
55 COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o 55 COBJS-$(CONFIG_ENV_IS_IN_MG_DISK) += env_mgdisk.o
56 COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o 56 COBJS-$(CONFIG_ENV_IS_IN_MMC) += env_mmc.o
57 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o 57 COBJS-$(CONFIG_ENV_IS_IN_NAND) += env_nand.o
58 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o 58 COBJS-$(CONFIG_ENV_IS_IN_NVRAM) += env_nvram.o
59 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o 59 COBJS-$(CONFIG_ENV_IS_IN_ONENAND) += env_onenand.o
60 COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o 60 COBJS-$(CONFIG_ENV_IS_IN_SPI_FLASH) += env_sf.o
61 COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o 61 COBJS-$(CONFIG_ENV_IS_NOWHERE) += env_nowhere.o
62 62
63 # command 63 # command
64 COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o 64 COBJS-$(CONFIG_CMD_AMBAPP) += cmd_ambapp.o
65 COBJS-$(CONFIG_SOURCE) += cmd_source.o 65 COBJS-$(CONFIG_SOURCE) += cmd_source.o
66 COBJS-$(CONFIG_CMD_SOURCE) += cmd_source.o 66 COBJS-$(CONFIG_CMD_SOURCE) += cmd_source.o
67 COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o 67 COBJS-$(CONFIG_CMD_BDI) += cmd_bdinfo.o
68 COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o 68 COBJS-$(CONFIG_CMD_BEDBUG) += bedbug.o cmd_bedbug.o
69 COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o 69 COBJS-$(CONFIG_CMD_BMP) += cmd_bmp.o
70 COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o 70 COBJS-$(CONFIG_CMD_BOOTLDR) += cmd_bootldr.o
71 COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o 71 COBJS-$(CONFIG_CMD_CACHE) += cmd_cache.o
72 COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o 72 COBJS-$(CONFIG_CMD_CONSOLE) += cmd_console.o
73 COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o 73 COBJS-$(CONFIG_CMD_CPLBINFO) += cmd_cplbinfo.o
74 COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o 74 COBJS-$(CONFIG_DATAFLASH_MMC_SELECT) += cmd_dataflash_mmc_mux.o
75 COBJS-$(CONFIG_CMD_DATE) += cmd_date.o 75 COBJS-$(CONFIG_CMD_DATE) += cmd_date.o
76 ifdef CONFIG_4xx 76 ifdef CONFIG_4xx
77 COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o 77 COBJS-$(CONFIG_CMD_SETGETDCR) += cmd_dcr.o
78 endif 78 endif
79 ifdef CONFIG_POST 79 ifdef CONFIG_POST
80 COBJS-$(CONFIG_CMD_DIAG) += cmd_diag.o 80 COBJS-$(CONFIG_CMD_DIAG) += cmd_diag.o
81 endif 81 endif
82 COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o 82 COBJS-$(CONFIG_CMD_DISPLAY) += cmd_display.o
83 COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o 83 COBJS-$(CONFIG_CMD_DTT) += cmd_dtt.o
84 COBJS-$(CONFIG_CMD_ECHO) += cmd_echo.o 84 COBJS-$(CONFIG_CMD_ECHO) += cmd_echo.o
85 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o 85 COBJS-$(CONFIG_ENV_IS_IN_EEPROM) += cmd_eeprom.o
86 COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o 86 COBJS-$(CONFIG_CMD_EEPROM) += cmd_eeprom.o
87 COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o 87 COBJS-$(CONFIG_CMD_ELF) += cmd_elf.o
88 COBJS-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o 88 COBJS-$(CONFIG_SYS_HUSH_PARSER) += cmd_exit.o
89 COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o 89 COBJS-$(CONFIG_CMD_EXT2) += cmd_ext2.o
90 COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o 90 COBJS-$(CONFIG_CMD_FAT) += cmd_fat.o
91 COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o 91 COBJS-$(CONFIG_CMD_FDC)$(CONFIG_CMD_FDOS) += cmd_fdc.o
92 COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o 92 COBJS-$(CONFIG_OF_LIBFDT) += cmd_fdt.o fdt_support.o
93 COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o 93 COBJS-$(CONFIG_CMD_FDOS) += cmd_fdos.o
94 COBJS-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o 94 COBJS-$(CONFIG_CMD_FITUPD) += cmd_fitupd.o
95 COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o 95 COBJS-$(CONFIG_CMD_FLASH) += cmd_flash.o
96 ifdef CONFIG_FPGA 96 ifdef CONFIG_FPGA
97 COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o 97 COBJS-$(CONFIG_CMD_FPGA) += cmd_fpga.o
98 endif 98 endif
99 COBJS-$(CONFIG_CMD_GPIO) += cmd_gpio.o 99 COBJS-$(CONFIG_CMD_GPIO) += cmd_gpio.o
100 COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o 100 COBJS-$(CONFIG_CMD_I2C) += cmd_i2c.o
101 COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o 101 COBJS-$(CONFIG_CMD_IDE) += cmd_ide.o
102 COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o 102 COBJS-$(CONFIG_CMD_IMMAP) += cmd_immap.o
103 COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o 103 COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o
104 COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o 104 COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o
105 COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o 105 COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
106 COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o 106 COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o
107 COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o 107 COBJS-$(CONFIG_CMD_LDRINFO) += cmd_ldrinfo.o
108 COBJS-$(CONFIG_CMD_LED) += cmd_led.o 108 COBJS-$(CONFIG_CMD_LED) += cmd_led.o
109 COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o 109 COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
110 COBJS-y += cmd_load.o 110 COBJS-y += cmd_load.o
111 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o 111 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
112 COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o 112 COBJS-$(CONFIG_ID_EEPROM) += cmd_mac.o
113 COBJS-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o 113 COBJS-$(CONFIG_CMD_MD5SUM) += cmd_md5sum.o
114 COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o 114 COBJS-$(CONFIG_CMD_MEMORY) += cmd_mem.o
115 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o 115 COBJS-$(CONFIG_CMD_MFSL) += cmd_mfsl.o
116 COBJS-$(CONFIG_CMD_MG_DISK) += cmd_mgdisk.o 116 COBJS-$(CONFIG_CMD_MG_DISK) += cmd_mgdisk.o
117 COBJS-$(CONFIG_MII) += miiphyutil.o 117 COBJS-$(CONFIG_MII) += miiphyutil.o
118 COBJS-$(CONFIG_CMD_MII) += miiphyutil.o 118 COBJS-$(CONFIG_CMD_MII) += miiphyutil.o
119 COBJS-$(CONFIG_PHYLIB) += miiphyutil.o 119 COBJS-$(CONFIG_PHYLIB) += miiphyutil.o
120 COBJS-$(CONFIG_CMD_MII) += cmd_mii.o 120 COBJS-$(CONFIG_CMD_MII) += cmd_mii.o
121 ifdef CONFIG_PHYLIB 121 ifdef CONFIG_PHYLIB
122 COBJS-$(CONFIG_CMD_MII) += cmd_mdio.o 122 COBJS-$(CONFIG_CMD_MII) += cmd_mdio.o
123 endif 123 endif
124 COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o 124 COBJS-$(CONFIG_CMD_MISC) += cmd_misc.o
125 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o 125 COBJS-$(CONFIG_CMD_MMC) += cmd_mmc.o
126 COBJS-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o 126 COBJS-$(CONFIG_CMD_MMC_SPI) += cmd_mmc_spi.o
127 COBJS-$(CONFIG_MP) += cmd_mp.o 127 COBJS-$(CONFIG_MP) += cmd_mp.o
128 COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o 128 COBJS-$(CONFIG_CMD_MTDPARTS) += cmd_mtdparts.o
129 COBJS-$(CONFIG_CMD_NAND) += cmd_nand.o 129 COBJS-$(CONFIG_CMD_NAND) += cmd_nand.o
130 COBJS-$(CONFIG_CMD_NET) += cmd_net.o 130 COBJS-$(CONFIG_CMD_NET) += cmd_net.o
131 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o 131 COBJS-$(CONFIG_CMD_ONENAND) += cmd_onenand.o
132 COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o 132 COBJS-$(CONFIG_CMD_OTP) += cmd_otp.o
133 ifdef CONFIG_PCI 133 ifdef CONFIG_PCI
134 COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o 134 COBJS-$(CONFIG_CMD_PCI) += cmd_pci.o
135 endif 135 endif
136 COBJS-y += cmd_pcmcia.o 136 COBJS-y += cmd_pcmcia.o
137 COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o 137 COBJS-$(CONFIG_CMD_PORTIO) += cmd_portio.o
138 COBJS-$(CONFIG_CMD_PXE) += cmd_pxe.o 138 COBJS-$(CONFIG_CMD_PXE) += cmd_pxe.o
139 COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o 139 COBJS-$(CONFIG_CMD_REGINFO) += cmd_reginfo.o
140 COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o 140 COBJS-$(CONFIG_CMD_REISER) += cmd_reiser.o
141 COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o 141 COBJS-$(CONFIG_CMD_SATA) += cmd_sata.o
142 COBJS-$(CONFIG_CMD_SF) += cmd_sf.o 142 COBJS-$(CONFIG_CMD_SF) += cmd_sf.o
143 COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o 143 COBJS-$(CONFIG_CMD_SCSI) += cmd_scsi.o
144 COBJS-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o 144 COBJS-$(CONFIG_CMD_SHA1SUM) += cmd_sha1sum.o
145 COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o 145 COBJS-$(CONFIG_CMD_SETEXPR) += cmd_setexpr.o
146 COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o 146 COBJS-$(CONFIG_CMD_SPI) += cmd_spi.o
147 COBJS-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o 147 COBJS-$(CONFIG_CMD_SPIBOOTLDR) += cmd_spibootldr.o
148 COBJS-$(CONFIG_CMD_STRINGS) += cmd_strings.o 148 COBJS-$(CONFIG_CMD_STRINGS) += cmd_strings.o
149 COBJS-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o 149 COBJS-$(CONFIG_CMD_TERMINAL) += cmd_terminal.o
150 COBJS-$(CONFIG_CMD_TIME) += cmd_time.o 150 COBJS-$(CONFIG_CMD_TIME) += cmd_time.o
151 COBJS-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o 151 COBJS-$(CONFIG_SYS_HUSH_PARSER) += cmd_test.o
152 COBJS-$(CONFIG_CMD_TPM) += cmd_tpm.o 152 COBJS-$(CONFIG_CMD_TPM) += cmd_tpm.o
153 COBJS-$(CONFIG_CMD_TSI148) += cmd_tsi148.o 153 COBJS-$(CONFIG_CMD_TSI148) += cmd_tsi148.o
154 COBJS-$(CONFIG_CMD_UBI) += cmd_ubi.o 154 COBJS-$(CONFIG_CMD_UBI) += cmd_ubi.o
155 COBJS-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o 155 COBJS-$(CONFIG_CMD_UBIFS) += cmd_ubifs.o
156 COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o 156 COBJS-$(CONFIG_CMD_UNIVERSE) += cmd_universe.o
157 COBJS-$(CONFIG_CMD_UNZIP) += cmd_unzip.o 157 COBJS-$(CONFIG_CMD_UNZIP) += cmd_unzip.o
158 ifdef CONFIG_CMD_USB 158 ifdef CONFIG_CMD_USB
159 COBJS-y += cmd_usb.o 159 COBJS-y += cmd_usb.o
160 COBJS-y += usb.o usb_hub.o 160 COBJS-y += usb.o usb_hub.o
161 COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o 161 COBJS-$(CONFIG_USB_STORAGE) += usb_storage.o
162 endif 162 endif
163 COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o 163 COBJS-$(CONFIG_CMD_XIMG) += cmd_ximg.o
164 COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o 164 COBJS-$(CONFIG_YAFFS2) += cmd_yaffs2.o
165 COBJS-$(CONFIG_CMD_SPL) += cmd_spl.o
165 166
166 # others 167 # others
167 ifdef CONFIG_DDR_SPD 168 ifdef CONFIG_DDR_SPD
168 SPD := y 169 SPD := y
169 endif 170 endif
170 ifdef CONFIG_SPD_EEPROM 171 ifdef CONFIG_SPD_EEPROM
171 SPD := y 172 SPD := y
172 endif 173 endif
173 COBJS-$(SPD) += ddr_spd.o 174 COBJS-$(SPD) += ddr_spd.o
174 COBJS-$(CONFIG_HWCONFIG) += hwconfig.o 175 COBJS-$(CONFIG_HWCONFIG) += hwconfig.o
175 COBJS-$(CONFIG_BOOTSTAGE) += bootstage.o 176 COBJS-$(CONFIG_BOOTSTAGE) += bootstage.o
176 COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o 177 COBJS-$(CONFIG_CONSOLE_MUX) += iomux.o
177 COBJS-y += flash.o 178 COBJS-y += flash.o
178 COBJS-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o 179 COBJS-$(CONFIG_CMD_KGDB) += kgdb.o kgdb_stubs.o
179 COBJS-$(CONFIG_KALLSYMS) += kallsyms.o 180 COBJS-$(CONFIG_KALLSYMS) += kallsyms.o
180 COBJS-$(CONFIG_LCD) += lcd.o 181 COBJS-$(CONFIG_LCD) += lcd.o
181 COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o 182 COBJS-$(CONFIG_LYNXKDI) += lynxkdi.o
182 COBJS-$(CONFIG_MENU) += menu.o 183 COBJS-$(CONFIG_MENU) += menu.o
183 COBJS-$(CONFIG_MODEM_SUPPORT) += modem.o 184 COBJS-$(CONFIG_MODEM_SUPPORT) += modem.o
184 COBJS-$(CONFIG_UPDATE_TFTP) += update.o 185 COBJS-$(CONFIG_UPDATE_TFTP) += update.o
185 COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o 186 COBJS-$(CONFIG_USB_KEYBOARD) += usb_kbd.o
186 endif 187 endif
187 188
188 ifdef CONFIG_SPL_BUILD 189 ifdef CONFIG_SPL_BUILD
189 COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o 190 COBJS-$(CONFIG_SPL_YMODEM_SUPPORT) += xyzModem.o
190 endif 191 endif
191 COBJS-y += console.o 192 COBJS-y += console.o
192 COBJS-y += dlmalloc.o 193 COBJS-y += dlmalloc.o
193 COBJS-y += memsize.o 194 COBJS-y += memsize.o
194 COBJS-y += stdio.o 195 COBJS-y += stdio.o
195 196
196 197
197 COBJS := $(sort $(COBJS-y)) 198 COBJS := $(sort $(COBJS-y))
198 XCOBJS := $(sort $(XCOBJS-y)) 199 XCOBJS := $(sort $(XCOBJS-y))
199 SRCS := $(COBJS:.o=.c) $(XCOBJS:.o=.c) 200 SRCS := $(COBJS:.o=.c) $(XCOBJS:.o=.c)
200 OBJS := $(addprefix $(obj),$(COBJS)) 201 OBJS := $(addprefix $(obj),$(COBJS))
201 XOBJS := $(addprefix $(obj),$(XCOBJS)) 202 XOBJS := $(addprefix $(obj),$(XCOBJS))
202 203
203 CPPFLAGS += -I.. 204 CPPFLAGS += -I..
204 205
205 all: $(LIB) $(XOBJS) 206 all: $(LIB) $(XOBJS)
206 207
207 $(LIB): $(obj).depend $(OBJS) 208 $(LIB): $(obj).depend $(OBJS)
208 $(call cmd_link_o_target, $(OBJS)) 209 $(call cmd_link_o_target, $(OBJS))
209 210
210 $(obj)env_embedded.o: $(src)env_embedded.c $(obj)../tools/envcrc 211 $(obj)env_embedded.o: $(src)env_embedded.c $(obj)../tools/envcrc
211 $(CC) $(AFLAGS) -Wa,--no-warn \ 212 $(CC) $(AFLAGS) -Wa,--no-warn \
212 -DENV_CRC=$(shell $(obj)../tools/envcrc) \ 213 -DENV_CRC=$(shell $(obj)../tools/envcrc) \
213 -c -o $@ $(src)env_embedded.c 214 -c -o $@ $(src)env_embedded.c
214 215
215 $(obj)../tools/envcrc: 216 $(obj)../tools/envcrc:
216 $(MAKE) -C ../tools 217 $(MAKE) -C ../tools
217 218
218 ######################################################################### 219 #########################################################################
219 220
220 # defines $(obj).depend target 221 # defines $(obj).depend target
221 include $(SRCTREE)/rules.mk 222 include $(SRCTREE)/rules.mk
222 223
223 sinclude $(obj).depend 224 sinclude $(obj).depend
224 225
225 ######################################################################### 226 #########################################################################
226 227
File was created 1 /*
2 * Copyright (C) 2011
3 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
4 *
5 * See file CREDITS for list of people who contributed to this
6 * project.
7 *
8 * This program is free software; you can redistribute it and/or
9 * modify it under the terms of the GNU General Public License as
10 * published by the Free Software Foundation; either version 2 of
11 * the License, or (at your option) any later version.
12 *
13 * This program is distributed in the hope that it will be useful,
14 * but WITHOUT ANY WARRANTY; without even the implied warranty of
15 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
16 * GNU General Public License for more details.
17 *
18 * You should have received a copy of the GNU General Public License
19 * along with this program; if not, write to the Free Software
20 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
21 * MA 02111-1307 USA
22 */
23
24 #include <common.h>
25 #include <command.h>
26 #include <cmd_spl.h>
27
28 DECLARE_GLOBAL_DATA_PTR;
29
30 static const char **subcmd_list[] = {
31
32 [SPL_EXPORT_FDT] = (const char * []) {
33 #ifdef CONFIG_OF_LIBFDT
34 "start",
35 "loados",
36 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
37 "ramdisk",
38 #endif
39 "fdt",
40 "cmdline",
41 "bdt",
42 "prep",
43 #endif
44 NULL,
45 },
46 [SPL_EXPORT_ATAGS] = (const char * []) {
47 #if defined(CONFIG_SETUP_MEMORY_TAGS) || \
48 defined(CONFIG_CMDLINE_TAG) || \
49 defined(CONFIG_INITRD_TAG) || \
50 defined(CONFIG_SERIAL_TAG) || \
51 defined(CONFIG_REVISION_TAG)
52 "start",
53 "loados",
54 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
55 "ramdisk",
56 #endif
57 "cmdline",
58 "bdt",
59 "prep",
60 #endif
61 NULL,
62 },
63 NULL
64 };
65
66 /* Calls bootm with the parameters given */
67 static int call_bootm(int argc, char * const argv[], const char *subcommand[])
68 {
69 char *bootm_argv[5];
70
71 int i = 0;
72 int ret = 0;
73 int j;
74
75 /* create paramter array */
76 bootm_argv[0] = "do_bootm";
77 switch (argc) {
78 case 3:
79 bootm_argv[4] = argv[2]; /* fdt addr */
80 case 2:
81 bootm_argv[3] = argv[1]; /* initrd addr */
82 case 1:
83 bootm_argv[2] = argv[0]; /* kernel addr */
84 }
85
86
87 /*
88 * - do the work -
89 * exec subcommands of do_bootm to init the images
90 * data structure
91 */
92 while (subcommand[i] != NULL) {
93 bootm_argv[1] = (char *)subcommand[i];
94 debug("args %d: %s %s ", argc, bootm_argv[0], bootm_argv[1]);
95 for (j = 0; j < argc; j++)
96 debug("%s ", bootm_argv[j + 2]);
97 debug("\n");
98
99 ret = do_bootm(find_cmd("do_bootm"), 0, argc+2,
100 bootm_argv);
101 debug("Subcommand retcode: %d\n", ret);
102 i++;
103 }
104
105 if (ret) {
106 printf("ERROR prep subcommand failed!\n");
107 return -1;
108 }
109
110 return 0;
111 }
112
113 static cmd_tbl_t cmd_spl_export_sub[] = {
114 U_BOOT_CMD_MKENT(fdt, 0, 1, (void *)SPL_EXPORT_FDT, "", ""),
115 U_BOOT_CMD_MKENT(atags, 0, 1, (void *)SPL_EXPORT_ATAGS, "", ""),
116 };
117
118 static int spl_export(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
119 {
120 const cmd_tbl_t *c;
121
122 if (argc < 2) /* no subcommand */
123 return cmd_usage(cmdtp);
124
125 c = find_cmd_tbl(argv[1], &cmd_spl_export_sub[0],
126 ARRAY_SIZE(cmd_spl_export_sub));
127 if ((c) && ((int)c->cmd <= SPL_EXPORT_LAST)) {
128 argc -= 2;
129 argv += 2;
130 if (call_bootm(argc, argv, subcmd_list[(int)c->cmd]))
131 return -1;
132 switch ((int)c->cmd) {
133 case SPL_EXPORT_FDT:
134 printf("Argument image is now in RAM: 0x%p\n",
135 (void *)images.ft_addr);
136 break;
137 case SPL_EXPORT_ATAGS:
138 printf("Argument image is now in RAM at: 0x%p\n",
139 (void *)gd->bd->bi_boot_params);
140 break;
141 }
142 } else {
143 /* Unrecognized command */
144 return cmd_usage(cmdtp);
145 }
146
147 return 0;
148 }
149
150 static cmd_tbl_t cmd_spl_sub[] = {
151 U_BOOT_CMD_MKENT(export, 0, 1, (void *)SPL_EXPORT, "", ""),
152 };
153
154 static int do_spl(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
155 {
156 const cmd_tbl_t *c;
157 int cmd;
158
159 if (argc < 2) /* no subcommand */
160 return cmd_usage(cmdtp);
161
162 c = find_cmd_tbl(argv[1], &cmd_spl_sub[0], ARRAY_SIZE(cmd_spl_sub));
163 if (c) {
164 cmd = (int)c->cmd;
165 switch (cmd) {
166 case SPL_EXPORT:
167 argc--;
168 argv++;
169 if (spl_export(cmdtp, flag, argc, argv))
170 printf("Subcommand failed\n");
171 break;
172 default:
173 /* unrecognized command */
174 return cmd_usage(cmdtp);
175 }
176 } else {
177 /* Unrecognized command */
178 return cmd_usage(cmdtp);
179 }
180 return 0;
181 }
182
183 U_BOOT_CMD(
184 spl, 6 , 1, do_spl, "SPL configuration",
185 "export <img=atags|fdt> [kernel_addr] [initrd_addr] "
186 "[fdt_addr if <img> = fdt] - export a kernel parameter image\n"
187 "\t initrd_img can be set to \"-\" if fdt_addr without initrd img is"
188 "used");
189
doc/README.commands.spl
Diff comments   View file @ 1648a37
File was created 1 The spl command is used to export a boot parameter image to RAM. Later
2 it may implement more functions connected to the SPL.
3
4 SUBCOMMAND EXPORT
5 To execute the command everything has to be in place as if bootm should be
6 used. (kernel image, initrd-image, fdt-image etc.)
7
8 export has two subcommands:
9 atags: exports the ATAGS
10 fdt: exports the FDT
11
12 Call is:
13 spl export <ftd|atags> [kernel_addr] [initrd_addr] [fdt_addr if fdt]
14
15
16 TYPICAL CALL
17
18 on OMAP3:
19 nandecc hw
20 nand read 0x82000000 0x280000 0x400000 /* Read kernel image from NAND*/
21 spl export atags /* export ATAGS */
22 nand erase 0x680000 0x20000 /* erase - one page */
23 nand write 0x80000100 0x680000 0x20000 /* write the image - one page */
24
25 call with FDT:
26 nandecc hw
27 nand read 0x82000000 0x280000 0x400000 /* Read kernel image from NAND*/
28 tftpboot 0x80000100 devkit8000.dtb /* Read fdt */
29 spl export fdt 0x82000000 - 0x80000100 /* export FDT */
30 nand erase 0x680000 0x20000 /* erase - one page */
31 nand write <adress shown by spl export> 0x680000 0x20000
32
File was created 1 /* Copyright (C) 2011
2 * Corscience GmbH & Co. KG - Simon Schwarz <schwarz@corscience.de>
3 *
4 * See file CREDITS for list of people who contributed to this
5 * project.
6 *
7 * This program is free software; you can redistribute it and/or
8 * modify it under the terms of the GNU General Public License as
9 * published by the Free Software Foundation; either version 2 of
10 * the License, or (at your option) any later version.
11 *
12 * This program is distributed in the hope that it will be useful,
13 * but WITHOUT ANY WARRANTY; without even the implied warranty of
14 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
15 * GNU General Public License for more details.
16 *
17 * You should have received a copy of the GNU General Public License
18 * along with this program; if not, write to the Free Software
19 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
20 * MA 02111-1307 USA
21 */
22 #ifndef _NAND_SPL_H_
23 #define _NAND_SPL_H_
24
25 #define SPL_EXPORT (0x00000001)
26
27 #define SPL_EXPORT_FDT (0x00000001)
28 #define SPL_EXPORT_ATAGS (0x00000002)
29 #define SPL_EXPORT_LAST SPL_EXPORT_ATAGS
30
31 #endif /* _NAND_SPL_H_ */
32
1 /* 1 /*
2 * (C) Copyright 2008 Semihalf 2 * (C) Copyright 2008 Semihalf
3 * 3 *
4 * (C) Copyright 2000-2005 4 * (C) Copyright 2000-2005
5 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. 5 * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
6 * 6 *
7 * See file CREDITS for list of people who contributed to this 7 * See file CREDITS for list of people who contributed to this
8 * project. 8 * project.
9 * 9 *
10 * This program is free software; you can redistribute it and/or 10 * This program is free software; you can redistribute it and/or
11 * modify it under the terms of the GNU General Public License as 11 * modify it under the terms of the GNU General Public License as
12 * published by the Free Software Foundation; either version 2 of 12 * published by the Free Software Foundation; either version 2 of
13 * the License, or (at your option) any later version. 13 * the License, or (at your option) any later version.
14 * 14 *
15 * This program is distributed in the hope that it will be useful, 15 * This program is distributed in the hope that it will be useful,
16 * but WITHOUT ANY WARRANTY; without even the implied warranty of 16 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 17 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
18 * GNU General Public License for more details. 18 * GNU General Public License for more details.
19 * 19 *
20 * You should have received a copy of the GNU General Public License 20 * You should have received a copy of the GNU General Public License
21 * along with this program; if not, write to the Free Software 21 * along with this program; if not, write to the Free Software
22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, 22 * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
23 * MA 02111-1307 USA 23 * MA 02111-1307 USA
24 * 24 *
25 ******************************************************************** 25 ********************************************************************
26 * NOTE: This header file defines an interface to U-Boot. Including 26 * NOTE: This header file defines an interface to U-Boot. Including
27 * this (unmodified) header file in another file is considered normal 27 * this (unmodified) header file in another file is considered normal
28 * use of U-Boot, and does *not* fall under the heading of "derived 28 * use of U-Boot, and does *not* fall under the heading of "derived
29 * work". 29 * work".
30 ******************************************************************** 30 ********************************************************************
31 */ 31 */
32 32
33 #ifndef __IMAGE_H__ 33 #ifndef __IMAGE_H__
34 #define __IMAGE_H__ 34 #define __IMAGE_H__
35 35
36 #include "compiler.h" 36 #include "compiler.h"
37 37
38 #ifdef USE_HOSTCC 38 #ifdef USE_HOSTCC
39 39
40 /* new uImage format support enabled on host */ 40 /* new uImage format support enabled on host */
41 #define CONFIG_FIT 1 41 #define CONFIG_FIT 1
42 #define CONFIG_OF_LIBFDT 1 42 #define CONFIG_OF_LIBFDT 1
43 #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */ 43 #define CONFIG_FIT_VERBOSE 1 /* enable fit_format_{error,warning}() */
44 44
45 #else 45 #else
46 46
47 #include <lmb.h> 47 #include <lmb.h>
48 #include <asm/u-boot.h> 48 #include <asm/u-boot.h>
49 #include <command.h> 49 #include <command.h>
50 50
51 #endif /* USE_HOSTCC */ 51 #endif /* USE_HOSTCC */
52 52
53 #if defined(CONFIG_FIT) 53 #if defined(CONFIG_FIT)
54 #include <fdt.h> 54 #include <fdt.h>
55 #include <libfdt.h> 55 #include <libfdt.h>
56 #include <fdt_support.h> 56 #include <fdt_support.h>
57 #define CONFIG_MD5 /* FIT images need MD5 support */ 57 #define CONFIG_MD5 /* FIT images need MD5 support */
58 #define CONFIG_SHA1 /* and SHA1 */ 58 #define CONFIG_SHA1 /* and SHA1 */
59 #endif 59 #endif
60 60
61 /* 61 /*
62 * Operating System Codes 62 * Operating System Codes
63 */ 63 */
64 #define IH_OS_INVALID 0 /* Invalid OS */ 64 #define IH_OS_INVALID 0 /* Invalid OS */
65 #define IH_OS_OPENBSD 1 /* OpenBSD */ 65 #define IH_OS_OPENBSD 1 /* OpenBSD */
66 #define IH_OS_NETBSD 2 /* NetBSD */ 66 #define IH_OS_NETBSD 2 /* NetBSD */
67 #define IH_OS_FREEBSD 3 /* FreeBSD */ 67 #define IH_OS_FREEBSD 3 /* FreeBSD */
68 #define IH_OS_4_4BSD 4 /* 4.4BSD */ 68 #define IH_OS_4_4BSD 4 /* 4.4BSD */
69 #define IH_OS_LINUX 5 /* Linux */ 69 #define IH_OS_LINUX 5 /* Linux */
70 #define IH_OS_SVR4 6 /* SVR4 */ 70 #define IH_OS_SVR4 6 /* SVR4 */
71 #define IH_OS_ESIX 7 /* Esix */ 71 #define IH_OS_ESIX 7 /* Esix */
72 #define IH_OS_SOLARIS 8 /* Solaris */ 72 #define IH_OS_SOLARIS 8 /* Solaris */
73 #define IH_OS_IRIX 9 /* Irix */ 73 #define IH_OS_IRIX 9 /* Irix */
74 #define IH_OS_SCO 10 /* SCO */ 74 #define IH_OS_SCO 10 /* SCO */
75 #define IH_OS_DELL 11 /* Dell */ 75 #define IH_OS_DELL 11 /* Dell */
76 #define IH_OS_NCR 12 /* NCR */ 76 #define IH_OS_NCR 12 /* NCR */
77 #define IH_OS_LYNXOS 13 /* LynxOS */ 77 #define IH_OS_LYNXOS 13 /* LynxOS */
78 #define IH_OS_VXWORKS 14 /* VxWorks */ 78 #define IH_OS_VXWORKS 14 /* VxWorks */
79 #define IH_OS_PSOS 15 /* pSOS */ 79 #define IH_OS_PSOS 15 /* pSOS */
80 #define IH_OS_QNX 16 /* QNX */ 80 #define IH_OS_QNX 16 /* QNX */
81 #define IH_OS_U_BOOT 17 /* Firmware */ 81 #define IH_OS_U_BOOT 17 /* Firmware */
82 #define IH_OS_RTEMS 18 /* RTEMS */ 82 #define IH_OS_RTEMS 18 /* RTEMS */
83 #define IH_OS_ARTOS 19 /* ARTOS */ 83 #define IH_OS_ARTOS 19 /* ARTOS */
84 #define IH_OS_UNITY 20 /* Unity OS */ 84 #define IH_OS_UNITY 20 /* Unity OS */
85 #define IH_OS_INTEGRITY 21 /* INTEGRITY */ 85 #define IH_OS_INTEGRITY 21 /* INTEGRITY */
86 #define IH_OS_OSE 22 /* OSE */ 86 #define IH_OS_OSE 22 /* OSE */
87 87
88 /* 88 /*
89 * CPU Architecture Codes (supported by Linux) 89 * CPU Architecture Codes (supported by Linux)
90 */ 90 */
91 #define IH_ARCH_INVALID 0 /* Invalid CPU */ 91 #define IH_ARCH_INVALID 0 /* Invalid CPU */
92 #define IH_ARCH_ALPHA 1 /* Alpha */ 92 #define IH_ARCH_ALPHA 1 /* Alpha */
93 #define IH_ARCH_ARM 2 /* ARM */ 93 #define IH_ARCH_ARM 2 /* ARM */
94 #define IH_ARCH_I386 3 /* Intel x86 */ 94 #define IH_ARCH_I386 3 /* Intel x86 */
95 #define IH_ARCH_IA64 4 /* IA64 */ 95 #define IH_ARCH_IA64 4 /* IA64 */
96 #define IH_ARCH_MIPS 5 /* MIPS */ 96 #define IH_ARCH_MIPS 5 /* MIPS */
97 #define IH_ARCH_MIPS64 6 /* MIPS 64 Bit */ 97 #define IH_ARCH_MIPS64 6 /* MIPS 64 Bit */
98 #define IH_ARCH_PPC 7 /* PowerPC */ 98 #define IH_ARCH_PPC 7 /* PowerPC */
99 #define IH_ARCH_S390 8 /* IBM S390 */ 99 #define IH_ARCH_S390 8 /* IBM S390 */
100 #define IH_ARCH_SH 9 /* SuperH */ 100 #define IH_ARCH_SH 9 /* SuperH */
101 #define IH_ARCH_SPARC 10 /* Sparc */ 101 #define IH_ARCH_SPARC 10 /* Sparc */
102 #define IH_ARCH_SPARC64 11 /* Sparc 64 Bit */ 102 #define IH_ARCH_SPARC64 11 /* Sparc 64 Bit */
103 #define IH_ARCH_M68K 12 /* M68K */ 103 #define IH_ARCH_M68K 12 /* M68K */
104 #define IH_ARCH_MICROBLAZE 14 /* MicroBlaze */ 104 #define IH_ARCH_MICROBLAZE 14 /* MicroBlaze */
105 #define IH_ARCH_NIOS2 15 /* Nios-II */ 105 #define IH_ARCH_NIOS2 15 /* Nios-II */
106 #define IH_ARCH_BLACKFIN 16 /* Blackfin */ 106 #define IH_ARCH_BLACKFIN 16 /* Blackfin */
107 #define IH_ARCH_AVR32 17 /* AVR32 */ 107 #define IH_ARCH_AVR32 17 /* AVR32 */
108 #define IH_ARCH_ST200 18 /* STMicroelectronics ST200 */ 108 #define IH_ARCH_ST200 18 /* STMicroelectronics ST200 */
109 #define IH_ARCH_SANDBOX 19 /* Sandbox architecture (test only) */ 109 #define IH_ARCH_SANDBOX 19 /* Sandbox architecture (test only) */
110 #define IH_ARCH_NDS32 20 /* ANDES Technology - NDS32 */ 110 #define IH_ARCH_NDS32 20 /* ANDES Technology - NDS32 */
111 #define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */ 111 #define IH_ARCH_OPENRISC 21 /* OpenRISC 1000 */
112 112
113 /* 113 /*
114 * Image Types 114 * Image Types
115 * 115 *
116 * "Standalone Programs" are directly runnable in the environment 116 * "Standalone Programs" are directly runnable in the environment
117 * provided by U-Boot; it is expected that (if they behave 117 * provided by U-Boot; it is expected that (if they behave
118 * well) you can continue to work in U-Boot after return from 118 * well) you can continue to work in U-Boot after return from
119 * the Standalone Program. 119 * the Standalone Program.
120 * "OS Kernel Images" are usually images of some Embedded OS which 120 * "OS Kernel Images" are usually images of some Embedded OS which
121 * will take over control completely. Usually these programs 121 * will take over control completely. Usually these programs
122 * will install their own set of exception handlers, device 122 * will install their own set of exception handlers, device
123 * drivers, set up the MMU, etc. - this means, that you cannot 123 * drivers, set up the MMU, etc. - this means, that you cannot
124 * expect to re-enter U-Boot except by resetting the CPU. 124 * expect to re-enter U-Boot except by resetting the CPU.
125 * "RAMDisk Images" are more or less just data blocks, and their 125 * "RAMDisk Images" are more or less just data blocks, and their
126 * parameters (address, size) are passed to an OS kernel that is 126 * parameters (address, size) are passed to an OS kernel that is
127 * being started. 127 * being started.
128 * "Multi-File Images" contain several images, typically an OS 128 * "Multi-File Images" contain several images, typically an OS
129 * (Linux) kernel image and one or more data images like 129 * (Linux) kernel image and one or more data images like
130 * RAMDisks. This construct is useful for instance when you want 130 * RAMDisks. This construct is useful for instance when you want
131 * to boot over the network using BOOTP etc., where the boot 131 * to boot over the network using BOOTP etc., where the boot
132 * server provides just a single image file, but you want to get 132 * server provides just a single image file, but you want to get
133 * for instance an OS kernel and a RAMDisk image. 133 * for instance an OS kernel and a RAMDisk image.
134 * 134 *
135 * "Multi-File Images" start with a list of image sizes, each 135 * "Multi-File Images" start with a list of image sizes, each
136 * image size (in bytes) specified by an "uint32_t" in network 136 * image size (in bytes) specified by an "uint32_t" in network
137 * byte order. This list is terminated by an "(uint32_t)0". 137 * byte order. This list is terminated by an "(uint32_t)0".
138 * Immediately after the terminating 0 follow the images, one by 138 * Immediately after the terminating 0 follow the images, one by
139 * one, all aligned on "uint32_t" boundaries (size rounded up to 139 * one, all aligned on "uint32_t" boundaries (size rounded up to
140 * a multiple of 4 bytes - except for the last file). 140 * a multiple of 4 bytes - except for the last file).
141 * 141 *
142 * "Firmware Images" are binary images containing firmware (like 142 * "Firmware Images" are binary images containing firmware (like
143 * U-Boot or FPGA images) which usually will be programmed to 143 * U-Boot or FPGA images) which usually will be programmed to
144 * flash memory. 144 * flash memory.
145 * 145 *
146 * "Script files" are command sequences that will be executed by 146 * "Script files" are command sequences that will be executed by
147 * U-Boot's command interpreter; this feature is especially 147 * U-Boot's command interpreter; this feature is especially
148 * useful when you configure U-Boot to use a real shell (hush) 148 * useful when you configure U-Boot to use a real shell (hush)
149 * as command interpreter (=> Shell Scripts). 149 * as command interpreter (=> Shell Scripts).
150 */ 150 */
151 151
152 #define IH_TYPE_INVALID 0 /* Invalid Image */ 152 #define IH_TYPE_INVALID 0 /* Invalid Image */
153 #define IH_TYPE_STANDALONE 1 /* Standalone Program */ 153 #define IH_TYPE_STANDALONE 1 /* Standalone Program */
154 #define IH_TYPE_KERNEL 2 /* OS Kernel Image */ 154 #define IH_TYPE_KERNEL 2 /* OS Kernel Image */
155 #define IH_TYPE_RAMDISK 3 /* RAMDisk Image */ 155 #define IH_TYPE_RAMDISK 3 /* RAMDisk Image */
156 #define IH_TYPE_MULTI 4 /* Multi-File Image */ 156 #define IH_TYPE_MULTI 4 /* Multi-File Image */
157 #define IH_TYPE_FIRMWARE 5 /* Firmware Image */ 157 #define IH_TYPE_FIRMWARE 5 /* Firmware Image */
158 #define IH_TYPE_SCRIPT 6 /* Script file */ 158 #define IH_TYPE_SCRIPT 6 /* Script file */
159 #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */ 159 #define IH_TYPE_FILESYSTEM 7 /* Filesystem Image (any type) */
160 #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */ 160 #define IH_TYPE_FLATDT 8 /* Binary Flat Device Tree Blob */
161 #define IH_TYPE_KWBIMAGE 9 /* Kirkwood Boot Image */ 161 #define IH_TYPE_KWBIMAGE 9 /* Kirkwood Boot Image */
162 #define IH_TYPE_IMXIMAGE 10 /* Freescale IMXBoot Image */ 162 #define IH_TYPE_IMXIMAGE 10 /* Freescale IMXBoot Image */
163 #define IH_TYPE_UBLIMAGE 11 /* Davinci UBL Image */ 163 #define IH_TYPE_UBLIMAGE 11 /* Davinci UBL Image */
164 #define IH_TYPE_OMAPIMAGE 12 /* TI OMAP Config Header Image */ 164 #define IH_TYPE_OMAPIMAGE 12 /* TI OMAP Config Header Image */
165 #define IH_TYPE_AISIMAGE 13 /* TI Davinci AIS Image */ 165 #define IH_TYPE_AISIMAGE 13 /* TI Davinci AIS Image */
166 #define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run from any load address */ 166 #define IH_TYPE_KERNEL_NOLOAD 14 /* OS Kernel Image, can run from any load address */
167 167
168 /* 168 /*
169 * Compression Types 169 * Compression Types
170 */ 170 */
171 #define IH_COMP_NONE 0 /* No Compression Used */ 171 #define IH_COMP_NONE 0 /* No Compression Used */
172 #define IH_COMP_GZIP 1 /* gzip Compression Used */ 172 #define IH_COMP_GZIP 1 /* gzip Compression Used */
173 #define IH_COMP_BZIP2 2 /* bzip2 Compression Used */ 173 #define IH_COMP_BZIP2 2 /* bzip2 Compression Used */
174 #define IH_COMP_LZMA 3 /* lzma Compression Used */ 174 #define IH_COMP_LZMA 3 /* lzma Compression Used */
175 #define IH_COMP_LZO 4 /* lzo Compression Used */ 175 #define IH_COMP_LZO 4 /* lzo Compression Used */
176 176
177 #define IH_MAGIC 0x27051956 /* Image Magic Number */ 177 #define IH_MAGIC 0x27051956 /* Image Magic Number */
178 #define IH_NMLEN 32 /* Image Name Length */ 178 #define IH_NMLEN 32 /* Image Name Length */
179 179
180 /* 180 /*
181 * Legacy format image header, 181 * Legacy format image header,
182 * all data in network byte order (aka natural aka bigendian). 182 * all data in network byte order (aka natural aka bigendian).
183 */ 183 */
184 typedef struct image_header { 184 typedef struct image_header {
185 uint32_t ih_magic; /* Image Header Magic Number */ 185 uint32_t ih_magic; /* Image Header Magic Number */
186 uint32_t ih_hcrc; /* Image Header CRC Checksum */ 186 uint32_t ih_hcrc; /* Image Header CRC Checksum */
187 uint32_t ih_time; /* Image Creation Timestamp */ 187 uint32_t ih_time; /* Image Creation Timestamp */
188 uint32_t ih_size; /* Image Data Size */ 188 uint32_t ih_size; /* Image Data Size */
189 uint32_t ih_load; /* Data Load Address */ 189 uint32_t ih_load; /* Data Load Address */
190 uint32_t ih_ep; /* Entry Point Address */ 190 uint32_t ih_ep; /* Entry Point Address */
191 uint32_t ih_dcrc; /* Image Data CRC Checksum */ 191 uint32_t ih_dcrc; /* Image Data CRC Checksum */
192 uint8_t ih_os; /* Operating System */ 192 uint8_t ih_os; /* Operating System */
193 uint8_t ih_arch; /* CPU architecture */ 193 uint8_t ih_arch; /* CPU architecture */
194 uint8_t ih_type; /* Image Type */ 194 uint8_t ih_type; /* Image Type */
195 uint8_t ih_comp; /* Compression Type */ 195 uint8_t ih_comp; /* Compression Type */
196 uint8_t ih_name[IH_NMLEN]; /* Image Name */ 196 uint8_t ih_name[IH_NMLEN]; /* Image Name */
197 } image_header_t; 197 } image_header_t;
198 198
199 typedef struct image_info { 199 typedef struct image_info {
200 ulong start, end; /* start/end of blob */ 200 ulong start, end; /* start/end of blob */
201 ulong image_start, image_len; /* start of image within blob, len of image */ 201 ulong image_start, image_len; /* start of image within blob, len of image */
202 ulong load; /* load addr for the image */ 202 ulong load; /* load addr for the image */
203 uint8_t comp, type, os; /* compression, type of image, os type */ 203 uint8_t comp, type, os; /* compression, type of image, os type */
204 } image_info_t; 204 } image_info_t;
205 205
206 /* 206 /*
207 * Legacy and FIT format headers used by do_bootm() and do_bootm_<os>() 207 * Legacy and FIT format headers used by do_bootm() and do_bootm_<os>()
208 * routines. 208 * routines.
209 */ 209 */
210 typedef struct bootm_headers { 210 typedef struct bootm_headers {
211 /* 211 /*
212 * Legacy os image header, if it is a multi component image 212 * Legacy os image header, if it is a multi component image
213 * then boot_get_ramdisk() and get_fdt() will attempt to get 213 * then boot_get_ramdisk() and get_fdt() will attempt to get
214 * data from second and third component accordingly. 214 * data from second and third component accordingly.
215 */ 215 */
216 image_header_t *legacy_hdr_os; /* image header pointer */ 216 image_header_t *legacy_hdr_os; /* image header pointer */
217 image_header_t legacy_hdr_os_copy; /* header copy */ 217 image_header_t legacy_hdr_os_copy; /* header copy */
218 ulong legacy_hdr_valid; 218 ulong legacy_hdr_valid;
219 219
220 #if defined(CONFIG_FIT) 220 #if defined(CONFIG_FIT)
221 const char *fit_uname_cfg; /* configuration node unit name */ 221 const char *fit_uname_cfg; /* configuration node unit name */
222 222
223 void *fit_hdr_os; /* os FIT image header */ 223 void *fit_hdr_os; /* os FIT image header */
224 const char *fit_uname_os; /* os subimage node unit name */ 224 const char *fit_uname_os; /* os subimage node unit name */
225 int fit_noffset_os; /* os subimage node offset */ 225 int fit_noffset_os; /* os subimage node offset */
226 226
227 void *fit_hdr_rd; /* init ramdisk FIT image header */ 227 void *fit_hdr_rd; /* init ramdisk FIT image header */
228 const char *fit_uname_rd; /* init ramdisk subimage node unit name */ 228 const char *fit_uname_rd; /* init ramdisk subimage node unit name */
229 int fit_noffset_rd; /* init ramdisk subimage node offset */ 229 int fit_noffset_rd; /* init ramdisk subimage node offset */
230 230
231 void *fit_hdr_fdt; /* FDT blob FIT image header */ 231 void *fit_hdr_fdt; /* FDT blob FIT image header */
232 const char *fit_uname_fdt; /* FDT blob subimage node unit name */ 232 const char *fit_uname_fdt; /* FDT blob subimage node unit name */
233 int fit_noffset_fdt;/* FDT blob subimage node offset */ 233 int fit_noffset_fdt;/* FDT blob subimage node offset */
234 #endif 234 #endif
235 235
236 #ifndef USE_HOSTCC 236 #ifndef USE_HOSTCC
237 image_info_t os; /* os image info */ 237 image_info_t os; /* os image info */
238 ulong ep; /* entry point of OS */ 238 ulong ep; /* entry point of OS */
239 239
240 ulong rd_start, rd_end;/* ramdisk start/end */ 240 ulong rd_start, rd_end;/* ramdisk start/end */
241 241
242 #ifdef CONFIG_OF_LIBFDT 242 #ifdef CONFIG_OF_LIBFDT
243 char *ft_addr; /* flat dev tree address */ 243 char *ft_addr; /* flat dev tree address */
244 #endif 244 #endif
245 ulong ft_len; /* length of flat device tree */ 245 ulong ft_len; /* length of flat device tree */
246 246
247 ulong initrd_start; 247 ulong initrd_start;
248 ulong initrd_end; 248 ulong initrd_end;
249 ulong cmdline_start; 249 ulong cmdline_start;
250 ulong cmdline_end; 250 ulong cmdline_end;
251 bd_t *kbd; 251 bd_t *kbd;
252 #endif 252 #endif
253 253
254 int verify; /* getenv("verify")[0] != 'n' */ 254 int verify; /* getenv("verify")[0] != 'n' */
255 255
256 #define BOOTM_STATE_START (0x00000001) 256 #define BOOTM_STATE_START (0x00000001)
257 #define BOOTM_STATE_LOADOS (0x00000002) 257 #define BOOTM_STATE_LOADOS (0x00000002)
258 #define BOOTM_STATE_RAMDISK (0x00000004) 258 #define BOOTM_STATE_RAMDISK (0x00000004)
259 #define BOOTM_STATE_FDT (0x00000008) 259 #define BOOTM_STATE_FDT (0x00000008)
260 #define BOOTM_STATE_OS_CMDLINE (0x00000010) 260 #define BOOTM_STATE_OS_CMDLINE (0x00000010)
261 #define BOOTM_STATE_OS_BD_T (0x00000020) 261 #define BOOTM_STATE_OS_BD_T (0x00000020)
262 #define BOOTM_STATE_OS_PREP (0x00000040) 262 #define BOOTM_STATE_OS_PREP (0x00000040)
263 #define BOOTM_STATE_OS_GO (0x00000080) 263 #define BOOTM_STATE_OS_GO (0x00000080)
264 int state; 264 int state;
265 265
266 #ifdef CONFIG_LMB 266 #ifdef CONFIG_LMB
267 struct lmb lmb; /* for memory mgmt */ 267 struct lmb lmb; /* for memory mgmt */
268 #endif 268 #endif
269 } bootm_headers_t; 269 } bootm_headers_t;
270 270
271 extern bootm_headers_t images;
272
271 /* 273 /*
272 * Some systems (for example LWMON) have very short watchdog periods; 274 * Some systems (for example LWMON) have very short watchdog periods;
273 * we must make sure to split long operations like memmove() or 275 * we must make sure to split long operations like memmove() or
274 * checksum calculations into reasonable chunks. 276 * checksum calculations into reasonable chunks.
275 */ 277 */
276 #ifndef CHUNKSZ 278 #ifndef CHUNKSZ
277 #define CHUNKSZ (64 * 1024) 279 #define CHUNKSZ (64 * 1024)
278 #endif 280 #endif
279 281
280 #ifndef CHUNKSZ_CRC32 282 #ifndef CHUNKSZ_CRC32
281 #define CHUNKSZ_CRC32 (64 * 1024) 283 #define CHUNKSZ_CRC32 (64 * 1024)
282 #endif 284 #endif
283 285
284 #ifndef CHUNKSZ_MD5 286 #ifndef CHUNKSZ_MD5
285 #define CHUNKSZ_MD5 (64 * 1024) 287 #define CHUNKSZ_MD5 (64 * 1024)
286 #endif 288 #endif
287 289
288 #ifndef CHUNKSZ_SHA1 290 #ifndef CHUNKSZ_SHA1
289 #define CHUNKSZ_SHA1 (64 * 1024) 291 #define CHUNKSZ_SHA1 (64 * 1024)
290 #endif 292 #endif
291 293
292 #define uimage_to_cpu(x) be32_to_cpu(x) 294 #define uimage_to_cpu(x) be32_to_cpu(x)
293 #define cpu_to_uimage(x) cpu_to_be32(x) 295 #define cpu_to_uimage(x) cpu_to_be32(x)
294 296
295 /* 297 /*
296 * Translation table for entries of a specific type; used by 298 * Translation table for entries of a specific type; used by
297 * get_table_entry_id() and get_table_entry_name(). 299 * get_table_entry_id() and get_table_entry_name().
298 */ 300 */
299 typedef struct table_entry { 301 typedef struct table_entry {
300 int id; 302 int id;
301 char *sname; /* short (input) name to find table entry */ 303 char *sname; /* short (input) name to find table entry */
302 char *lname; /* long (output) name to print for messages */ 304 char *lname; /* long (output) name to print for messages */
303 } table_entry_t; 305 } table_entry_t;
304 306
305 /* 307 /*
306 * get_table_entry_id() scans the translation table trying to find an 308 * get_table_entry_id() scans the translation table trying to find an
307 * entry that matches the given short name. If a matching entry is 309 * entry that matches the given short name. If a matching entry is
308 * found, it's id is returned to the caller. 310 * found, it's id is returned to the caller.
309 */ 311 */
310 int get_table_entry_id(const table_entry_t *table, 312 int get_table_entry_id(const table_entry_t *table,
311 const char *table_name, const char *name); 313 const char *table_name, const char *name);
312 /* 314 /*
313 * get_table_entry_name() scans the translation table trying to find 315 * get_table_entry_name() scans the translation table trying to find
314 * an entry that matches the given id. If a matching entry is found, 316 * an entry that matches the given id. If a matching entry is found,
315 * its long name is returned to the caller. 317 * its long name is returned to the caller.
316 */ 318 */
317 char *get_table_entry_name(const table_entry_t *table, char *msg, int id); 319 char *get_table_entry_name(const table_entry_t *table, char *msg, int id);
318 320
319 const char *genimg_get_os_name(uint8_t os); 321 const char *genimg_get_os_name(uint8_t os);
320 const char *genimg_get_arch_name(uint8_t arch); 322 const char *genimg_get_arch_name(uint8_t arch);
321 const char *genimg_get_type_name(uint8_t type); 323 const char *genimg_get_type_name(uint8_t type);
322 const char *genimg_get_comp_name(uint8_t comp); 324 const char *genimg_get_comp_name(uint8_t comp);
323 int genimg_get_os_id(const char *name); 325 int genimg_get_os_id(const char *name);
324 int genimg_get_arch_id(const char *name); 326 int genimg_get_arch_id(const char *name);
325 int genimg_get_type_id(const char *name); 327 int genimg_get_type_id(const char *name);
326 int genimg_get_comp_id(const char *name); 328 int genimg_get_comp_id(const char *name);
327 void genimg_print_size(uint32_t size); 329 void genimg_print_size(uint32_t size);
328 330
329 #ifndef USE_HOSTCC 331 #ifndef USE_HOSTCC
330 /* Image format types, returned by _get_format() routine */ 332 /* Image format types, returned by _get_format() routine */
331 #define IMAGE_FORMAT_INVALID 0x00 333 #define IMAGE_FORMAT_INVALID 0x00
332 #define IMAGE_FORMAT_LEGACY 0x01 /* legacy image_header based format */ 334 #define IMAGE_FORMAT_LEGACY 0x01 /* legacy image_header based format */
333 #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */ 335 #define IMAGE_FORMAT_FIT 0x02 /* new, libfdt based format */
334 336
335 int genimg_get_format(void *img_addr); 337 int genimg_get_format(void *img_addr);
336 int genimg_has_config(bootm_headers_t *images); 338 int genimg_has_config(bootm_headers_t *images);
337 ulong genimg_get_image(ulong img_addr); 339 ulong genimg_get_image(ulong img_addr);
338 340
339 int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images, 341 int boot_get_ramdisk(int argc, char * const argv[], bootm_headers_t *images,
340 uint8_t arch, ulong *rd_start, ulong *rd_end); 342 uint8_t arch, ulong *rd_start, ulong *rd_end);
341 343
342 344
343 #ifdef CONFIG_OF_LIBFDT 345 #ifdef CONFIG_OF_LIBFDT
344 int boot_get_fdt(int flag, int argc, char * const argv[], 346 int boot_get_fdt(int flag, int argc, char * const argv[],
345 bootm_headers_t *images, char **of_flat_tree, ulong *of_size); 347 bootm_headers_t *images, char **of_flat_tree, ulong *of_size);
346 void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob); 348 void boot_fdt_add_mem_rsv_regions(struct lmb *lmb, void *fdt_blob);
347 int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size); 349 int boot_relocate_fdt(struct lmb *lmb, char **of_flat_tree, ulong *of_size);
348 #endif 350 #endif
349 351
350 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH 352 #ifdef CONFIG_SYS_BOOT_RAMDISK_HIGH
351 int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len, 353 int boot_ramdisk_high(struct lmb *lmb, ulong rd_data, ulong rd_len,
352 ulong *initrd_start, ulong *initrd_end); 354 ulong *initrd_start, ulong *initrd_end);
353 #endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */ 355 #endif /* CONFIG_SYS_BOOT_RAMDISK_HIGH */
354 #ifdef CONFIG_SYS_BOOT_GET_CMDLINE 356 #ifdef CONFIG_SYS_BOOT_GET_CMDLINE
355 int boot_get_cmdline(struct lmb *lmb, ulong *cmd_start, ulong *cmd_end); 357 int boot_get_cmdline(struct lmb *lmb, ulong *cmd_start, ulong *cmd_end);
356 #endif /* CONFIG_SYS_BOOT_GET_CMDLINE */ 358 #endif /* CONFIG_SYS_BOOT_GET_CMDLINE */
357 #ifdef CONFIG_SYS_BOOT_GET_KBD 359 #ifdef CONFIG_SYS_BOOT_GET_KBD
358 int boot_get_kbd(struct lmb *lmb, bd_t **kbd); 360 int boot_get_kbd(struct lmb *lmb, bd_t **kbd);
359 #endif /* CONFIG_SYS_BOOT_GET_KBD */ 361 #endif /* CONFIG_SYS_BOOT_GET_KBD */
360 #endif /* !USE_HOSTCC */ 362 #endif /* !USE_HOSTCC */
361 363
362 /*******************************************************************/ 364 /*******************************************************************/
363 /* Legacy format specific code (prefixed with image_) */ 365 /* Legacy format specific code (prefixed with image_) */
364 /*******************************************************************/ 366 /*******************************************************************/
365 static inline uint32_t image_get_header_size(void) 367 static inline uint32_t image_get_header_size(void)
366 { 368 {
367 return (sizeof(image_header_t)); 369 return (sizeof(image_header_t));
368 } 370 }
369 371
370 #define image_get_hdr_l(f) \ 372 #define image_get_hdr_l(f) \
371 static inline uint32_t image_get_##f(const image_header_t *hdr) \ 373 static inline uint32_t image_get_##f(const image_header_t *hdr) \
372 { \ 374 { \
373 return uimage_to_cpu(hdr->ih_##f); \ 375 return uimage_to_cpu(hdr->ih_##f); \
374 } 376 }
375 image_get_hdr_l(magic) /* image_get_magic */ 377 image_get_hdr_l(magic) /* image_get_magic */
376 image_get_hdr_l(hcrc) /* image_get_hcrc */ 378 image_get_hdr_l(hcrc) /* image_get_hcrc */
377 image_get_hdr_l(time) /* image_get_time */ 379 image_get_hdr_l(time) /* image_get_time */
378 image_get_hdr_l(size) /* image_get_size */ 380 image_get_hdr_l(size) /* image_get_size */
379 image_get_hdr_l(load) /* image_get_load */ 381 image_get_hdr_l(load) /* image_get_load */
380 image_get_hdr_l(ep) /* image_get_ep */ 382 image_get_hdr_l(ep) /* image_get_ep */
381 image_get_hdr_l(dcrc) /* image_get_dcrc */ 383 image_get_hdr_l(dcrc) /* image_get_dcrc */
382 384
383 #define image_get_hdr_b(f) \ 385 #define image_get_hdr_b(f) \
384 static inline uint8_t image_get_##f(const image_header_t *hdr) \ 386 static inline uint8_t image_get_##f(const image_header_t *hdr) \
385 { \ 387 { \
386 return hdr->ih_##f; \ 388 return hdr->ih_##f; \
387 } 389 }
388 image_get_hdr_b(os) /* image_get_os */ 390 image_get_hdr_b(os) /* image_get_os */
389 image_get_hdr_b(arch) /* image_get_arch */ 391 image_get_hdr_b(arch) /* image_get_arch */
390 image_get_hdr_b(type) /* image_get_type */ 392 image_get_hdr_b(type) /* image_get_type */
391 image_get_hdr_b(comp) /* image_get_comp */ 393 image_get_hdr_b(comp) /* image_get_comp */
392 394
393 static inline char *image_get_name(const image_header_t *hdr) 395 static inline char *image_get_name(const image_header_t *hdr)
394 { 396 {
395 return (char *)hdr->ih_name; 397 return (char *)hdr->ih_name;
396 } 398 }
397 399
398 static inline uint32_t image_get_data_size(const image_header_t *hdr) 400 static inline uint32_t image_get_data_size(const image_header_t *hdr)
399 { 401 {
400 return image_get_size(hdr); 402 return image_get_size(hdr);
401 } 403 }
402 404
403 /** 405 /**
404 * image_get_data - get image payload start address 406 * image_get_data - get image payload start address
405 * @hdr: image header 407 * @hdr: image header
406 * 408 *
407 * image_get_data() returns address of the image payload. For single 409 * image_get_data() returns address of the image payload. For single
408 * component images it is image data start. For multi component 410 * component images it is image data start. For multi component
409 * images it points to the null terminated table of sub-images sizes. 411 * images it points to the null terminated table of sub-images sizes.
410 * 412 *
411 * returns: 413 * returns:
412 * image payload data start address 414 * image payload data start address
413 */ 415 */
414 static inline ulong image_get_data(const image_header_t *hdr) 416 static inline ulong image_get_data(const image_header_t *hdr)
415 { 417 {
416 return ((ulong)hdr + image_get_header_size()); 418 return ((ulong)hdr + image_get_header_size());
417 } 419 }
418 420
419 static inline uint32_t image_get_image_size(const image_header_t *hdr) 421 static inline uint32_t image_get_image_size(const image_header_t *hdr)
420 { 422 {
421 return (image_get_size(hdr) + image_get_header_size()); 423 return (image_get_size(hdr) + image_get_header_size());
422 } 424 }
423 static inline ulong image_get_image_end(const image_header_t *hdr) 425 static inline ulong image_get_image_end(const image_header_t *hdr)
424 { 426 {
425 return ((ulong)hdr + image_get_image_size(hdr)); 427 return ((ulong)hdr + image_get_image_size(hdr));
426 } 428 }
427 429
428 #define image_set_hdr_l(f) \ 430 #define image_set_hdr_l(f) \
429 static inline void image_set_##f(image_header_t *hdr, uint32_t val) \ 431 static inline void image_set_##f(image_header_t *hdr, uint32_t val) \
430 { \ 432 { \
431 hdr->ih_##f = cpu_to_uimage(val); \ 433 hdr->ih_##f = cpu_to_uimage(val); \
432 } 434 }
433 image_set_hdr_l(magic) /* image_set_magic */ 435 image_set_hdr_l(magic) /* image_set_magic */
434 image_set_hdr_l(hcrc) /* image_set_hcrc */ 436 image_set_hdr_l(hcrc) /* image_set_hcrc */
435 image_set_hdr_l(time) /* image_set_time */ 437 image_set_hdr_l(time) /* image_set_time */
436 image_set_hdr_l(size) /* image_set_size */ 438 image_set_hdr_l(size) /* image_set_size */
437 image_set_hdr_l(load) /* image_set_load */ 439 image_set_hdr_l(load) /* image_set_load */
438 image_set_hdr_l(ep) /* image_set_ep */ 440 image_set_hdr_l(ep) /* image_set_ep */
439 image_set_hdr_l(dcrc) /* image_set_dcrc */ 441 image_set_hdr_l(dcrc) /* image_set_dcrc */
440 442
441 #define image_set_hdr_b(f) \ 443 #define image_set_hdr_b(f) \
442 static inline void image_set_##f(image_header_t *hdr, uint8_t val) \ 444 static inline void image_set_##f(image_header_t *hdr, uint8_t val) \
443 { \ 445 { \
444 hdr->ih_##f = val; \ 446 hdr->ih_##f = val; \
445 } 447 }
446 image_set_hdr_b(os) /* image_set_os */ 448 image_set_hdr_b(os) /* image_set_os */
447 image_set_hdr_b(arch) /* image_set_arch */ 449 image_set_hdr_b(arch) /* image_set_arch */
448 image_set_hdr_b(type) /* image_set_type */ 450 image_set_hdr_b(type) /* image_set_type */
449 image_set_hdr_b(comp) /* image_set_comp */ 451 image_set_hdr_b(comp) /* image_set_comp */
450 452
451 static inline void image_set_name(image_header_t *hdr, const char *name) 453 static inline void image_set_name(image_header_t *hdr, const char *name)
452 { 454 {
453 strncpy(image_get_name(hdr), name, IH_NMLEN); 455 strncpy(image_get_name(hdr), name, IH_NMLEN);
454 } 456 }
455 457
456 int image_check_hcrc(const image_header_t *hdr); 458 int image_check_hcrc(const image_header_t *hdr);
457 int image_check_dcrc(const image_header_t *hdr); 459 int image_check_dcrc(const image_header_t *hdr);
458 #ifndef USE_HOSTCC 460 #ifndef USE_HOSTCC
459 int getenv_yesno(char *var); 461 int getenv_yesno(char *var);
460 ulong getenv_bootm_low(void); 462 ulong getenv_bootm_low(void);
461 phys_size_t getenv_bootm_size(void); 463 phys_size_t getenv_bootm_size(void);
462 phys_size_t getenv_bootm_mapsize(void); 464 phys_size_t getenv_bootm_mapsize(void);
463 void memmove_wd(void *to, void *from, size_t len, ulong chunksz); 465 void memmove_wd(void *to, void *from, size_t len, ulong chunksz);
464 #endif 466 #endif
465 467
466 static inline int image_check_magic(const image_header_t *hdr) 468 static inline int image_check_magic(const image_header_t *hdr)
467 { 469 {
468 return (image_get_magic(hdr) == IH_MAGIC); 470 return (image_get_magic(hdr) == IH_MAGIC);
469 } 471 }
470 static inline int image_check_type(const image_header_t *hdr, uint8_t type) 472 static inline int image_check_type(const image_header_t *hdr, uint8_t type)
471 { 473 {
472 return (image_get_type(hdr) == type); 474 return (image_get_type(hdr) == type);
473 } 475 }
474 static inline int image_check_arch(const image_header_t *hdr, uint8_t arch) 476 static inline int image_check_arch(const image_header_t *hdr, uint8_t arch)
475 { 477 {
476 return (image_get_arch(hdr) == arch); 478 return (image_get_arch(hdr) == arch);
477 } 479 }
478 static inline int image_check_os(const image_header_t *hdr, uint8_t os) 480 static inline int image_check_os(const image_header_t *hdr, uint8_t os)
479 { 481 {
480 return (image_get_os(hdr) == os); 482 return (image_get_os(hdr) == os);
481 } 483 }
482 484
483 ulong image_multi_count(const image_header_t *hdr); 485 ulong image_multi_count(const image_header_t *hdr);
484 void image_multi_getimg(const image_header_t *hdr, ulong idx, 486 void image_multi_getimg(const image_header_t *hdr, ulong idx,
485 ulong *data, ulong *len); 487 ulong *data, ulong *len);
486 488
487 void image_print_contents(const void *hdr); 489 void image_print_contents(const void *hdr);
488 490
489 #ifndef USE_HOSTCC 491 #ifndef USE_HOSTCC
490 static inline int image_check_target_arch(const image_header_t *hdr) 492 static inline int image_check_target_arch(const image_header_t *hdr)
491 { 493 {
492 #ifndef IH_ARCH_DEFAULT 494 #ifndef IH_ARCH_DEFAULT
493 # error "please define IH_ARCH_DEFAULT in your arch asm/u-boot.h" 495 # error "please define IH_ARCH_DEFAULT in your arch asm/u-boot.h"
494 #endif 496 #endif
495 return image_check_arch(hdr, IH_ARCH_DEFAULT); 497 return image_check_arch(hdr, IH_ARCH_DEFAULT);
496 } 498 }
497 #endif /* USE_HOSTCC */ 499 #endif /* USE_HOSTCC */
498 500
499 /*******************************************************************/ 501 /*******************************************************************/
500 /* New uImage format specific code (prefixed with fit_) */ 502 /* New uImage format specific code (prefixed with fit_) */
501 /*******************************************************************/ 503 /*******************************************************************/
502 #if defined(CONFIG_FIT) 504 #if defined(CONFIG_FIT)
503 505
504 #define FIT_IMAGES_PATH "/images" 506 #define FIT_IMAGES_PATH "/images"
505 #define FIT_CONFS_PATH "/configurations" 507 #define FIT_CONFS_PATH "/configurations"
506 508
507 /* hash node */ 509 /* hash node */
508 #define FIT_HASH_NODENAME "hash" 510 #define FIT_HASH_NODENAME "hash"
509 #define FIT_ALGO_PROP "algo" 511 #define FIT_ALGO_PROP "algo"
510 #define FIT_VALUE_PROP "value" 512 #define FIT_VALUE_PROP "value"
511 513
512 /* image node */ 514 /* image node */
513 #define FIT_DATA_PROP "data" 515 #define FIT_DATA_PROP "data"
514 #define FIT_TIMESTAMP_PROP "timestamp" 516 #define FIT_TIMESTAMP_PROP "timestamp"
515 #define FIT_DESC_PROP "description" 517 #define FIT_DESC_PROP "description"
516 #define FIT_ARCH_PROP "arch" 518 #define FIT_ARCH_PROP "arch"
517 #define FIT_TYPE_PROP "type" 519 #define FIT_TYPE_PROP "type"
518 #define FIT_OS_PROP "os" 520 #define FIT_OS_PROP "os"
519 #define FIT_COMP_PROP "compression" 521 #define FIT_COMP_PROP "compression"
520 #define FIT_ENTRY_PROP "entry" 522 #define FIT_ENTRY_PROP "entry"
521 #define FIT_LOAD_PROP "load" 523 #define FIT_LOAD_PROP "load"
522 524
523 /* configuration node */ 525 /* configuration node */
524 #define FIT_KERNEL_PROP "kernel" 526 #define FIT_KERNEL_PROP "kernel"
525 #define FIT_RAMDISK_PROP "ramdisk" 527 #define FIT_RAMDISK_PROP "ramdisk"
526 #define FIT_FDT_PROP "fdt" 528 #define FIT_FDT_PROP "fdt"
527 #define FIT_DEFAULT_PROP "default" 529 #define FIT_DEFAULT_PROP "default"
528 530
529 #define FIT_MAX_HASH_LEN 20 /* max(crc32_len(4), sha1_len(20)) */ 531 #define FIT_MAX_HASH_LEN 20 /* max(crc32_len(4), sha1_len(20)) */
530 532
531 /* cmdline argument format parsing */ 533 /* cmdline argument format parsing */
532 inline int fit_parse_conf(const char *spec, ulong addr_curr, 534 inline int fit_parse_conf(const char *spec, ulong addr_curr,
533 ulong *addr, const char **conf_name); 535 ulong *addr, const char **conf_name);
534 inline int fit_parse_subimage(const char *spec, ulong addr_curr, 536 inline int fit_parse_subimage(const char *spec, ulong addr_curr,
535 ulong *addr, const char **image_name); 537 ulong *addr, const char **image_name);
536 538
537 void fit_print_contents(const void *fit); 539 void fit_print_contents(const void *fit);
538 void fit_image_print(const void *fit, int noffset, const char *p); 540 void fit_image_print(const void *fit, int noffset, const char *p);
539 void fit_image_print_hash(const void *fit, int noffset, const char *p); 541 void fit_image_print_hash(const void *fit, int noffset, const char *p);
540 542
541 /** 543 /**
542 * fit_get_end - get FIT image size 544 * fit_get_end - get FIT image size
543 * @fit: pointer to the FIT format image header 545 * @fit: pointer to the FIT format image header
544 * 546 *
545 * returns: 547 * returns:
546 * size of the FIT image (blob) in memory 548 * size of the FIT image (blob) in memory
547 */ 549 */
548 static inline ulong fit_get_size(const void *fit) 550 static inline ulong fit_get_size(const void *fit)
549 { 551 {
550 return fdt_totalsize(fit); 552 return fdt_totalsize(fit);
551 } 553 }
552 554
553 /** 555 /**
554 * fit_get_end - get FIT image end 556 * fit_get_end - get FIT image end
555 * @fit: pointer to the FIT format image header 557 * @fit: pointer to the FIT format image header
556 * 558 *
557 * returns: 559 * returns:
558 * end address of the FIT image (blob) in memory 560 * end address of the FIT image (blob) in memory
559 */ 561 */
560 static inline ulong fit_get_end(const void *fit) 562 static inline ulong fit_get_end(const void *fit)
561 { 563 {
562 return (ulong)fit + fdt_totalsize(fit); 564 return (ulong)fit + fdt_totalsize(fit);
563 } 565 }
564 566
565 /** 567 /**
566 * fit_get_name - get FIT node name 568 * fit_get_name - get FIT node name
567 * @fit: pointer to the FIT format image header 569 * @fit: pointer to the FIT format image header
568 * 570 *
569 * returns: 571 * returns:
570 * NULL, on error 572 * NULL, on error
571 * pointer to node name, on success 573 * pointer to node name, on success
572 */ 574 */
573 static inline const char *fit_get_name(const void *fit_hdr, 575 static inline const char *fit_get_name(const void *fit_hdr,
574 int noffset, int *len) 576 int noffset, int *len)
575 { 577 {
576 return fdt_get_name(fit_hdr, noffset, len); 578 return fdt_get_name(fit_hdr, noffset, len);
577 } 579 }
578 580
579 int fit_get_desc(const void *fit, int noffset, char **desc); 581 int fit_get_desc(const void *fit, int noffset, char **desc);
580 int fit_get_timestamp(const void *fit, int noffset, time_t *timestamp); 582 int fit_get_timestamp(const void *fit, int noffset, time_t *timestamp);
581 583
582 int fit_image_get_node(const void *fit, const char *image_uname); 584 int fit_image_get_node(const void *fit, const char *image_uname);
583 int fit_image_get_os(const void *fit, int noffset, uint8_t *os); 585 int fit_image_get_os(const void *fit, int noffset, uint8_t *os);
584 int fit_image_get_arch(const void *fit, int noffset, uint8_t *arch); 586 int fit_image_get_arch(const void *fit, int noffset, uint8_t *arch);
585 int fit_image_get_type(const void *fit, int noffset, uint8_t *type); 587 int fit_image_get_type(const void *fit, int noffset, uint8_t *type);
586 int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp); 588 int fit_image_get_comp(const void *fit, int noffset, uint8_t *comp);
587 int fit_image_get_load(const void *fit, int noffset, ulong *load); 589 int fit_image_get_load(const void *fit, int noffset, ulong *load);
588 int fit_image_get_entry(const void *fit, int noffset, ulong *entry); 590 int fit_image_get_entry(const void *fit, int noffset, ulong *entry);
589 int fit_image_get_data(const void *fit, int noffset, 591 int fit_image_get_data(const void *fit, int noffset,
590 const void **data, size_t *size); 592 const void **data, size_t *size);
591 593
592 int fit_image_hash_get_algo(const void *fit, int noffset, char **algo); 594 int fit_image_hash_get_algo(const void *fit, int noffset, char **algo);
593 int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value, 595 int fit_image_hash_get_value(const void *fit, int noffset, uint8_t **value,
594 int *value_len); 596 int *value_len);
595 597
596 int fit_set_timestamp(void *fit, int noffset, time_t timestamp); 598 int fit_set_timestamp(void *fit, int noffset, time_t timestamp);
597 int fit_set_hashes(void *fit); 599 int fit_set_hashes(void *fit);
598 int fit_image_set_hashes(void *fit, int image_noffset); 600 int fit_image_set_hashes(void *fit, int image_noffset);
599 int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value, 601 int fit_image_hash_set_value(void *fit, int noffset, uint8_t *value,
600 int value_len); 602 int value_len);
601 603
602 int fit_image_check_hashes(const void *fit, int noffset); 604 int fit_image_check_hashes(const void *fit, int noffset);
603 int fit_all_image_check_hashes(const void *fit); 605 int fit_all_image_check_hashes(const void *fit);
604 int fit_image_check_os(const void *fit, int noffset, uint8_t os); 606 int fit_image_check_os(const void *fit, int noffset, uint8_t os);
605 int fit_image_check_arch(const void *fit, int noffset, uint8_t arch); 607 int fit_image_check_arch(const void *fit, int noffset, uint8_t arch);
606 int fit_image_check_type(const void *fit, int noffset, uint8_t type); 608 int fit_image_check_type(const void *fit, int noffset, uint8_t type);
607 int fit_image_check_comp(const void *fit, int noffset, uint8_t comp); 609 int fit_image_check_comp(const void *fit, int noffset, uint8_t comp);
608 int fit_check_format(const void *fit); 610 int fit_check_format(const void *fit);
609 611
610 int fit_conf_get_node(const void *fit, const char *conf_uname); 612 int fit_conf_get_node(const void *fit, const char *conf_uname);
611 int fit_conf_get_kernel_node(const void *fit, int noffset); 613 int fit_conf_get_kernel_node(const void *fit, int noffset);
612 int fit_conf_get_ramdisk_node(const void *fit, int noffset); 614 int fit_conf_get_ramdisk_node(const void *fit, int noffset);
613 int fit_conf_get_fdt_node(const void *fit, int noffset); 615 int fit_conf_get_fdt_node(const void *fit, int noffset);
614 616
615 void fit_conf_print(const void *fit, int noffset, const char *p); 617 void fit_conf_print(const void *fit, int noffset, const char *p);
616 618
617 #ifndef USE_HOSTCC 619 #ifndef USE_HOSTCC
618 static inline int fit_image_check_target_arch(const void *fdt, int node) 620 static inline int fit_image_check_target_arch(const void *fdt, int node)
619 { 621 {
620 return fit_image_check_arch(fdt, node, IH_ARCH_DEFAULT); 622 return fit_image_check_arch(fdt, node, IH_ARCH_DEFAULT);
621 } 623 }
622 #endif /* USE_HOSTCC */ 624 #endif /* USE_HOSTCC */
623 625
624 #ifdef CONFIG_FIT_VERBOSE 626 #ifdef CONFIG_FIT_VERBOSE
625 #define fit_unsupported(msg) printf("! %s:%d " \ 627 #define fit_unsupported(msg) printf("! %s:%d " \
626 "FIT images not supported for '%s'\n", \ 628 "FIT images not supported for '%s'\n", \
627 __FILE__, __LINE__, (msg)) 629 __FILE__, __LINE__, (msg))
628 630
629 #define fit_unsupported_reset(msg) printf("! %s:%d " \ 631 #define fit_unsupported_reset(msg) printf("! %s:%d " \
630 "FIT images not supported for '%s' " \ 632 "FIT images not supported for '%s' " \
631 "- must reset board to recover!\n", \ 633 "- must reset board to recover!\n", \
632 __FILE__, __LINE__, (msg)) 634 __FILE__, __LINE__, (msg))
633 #else 635 #else
634 #define fit_unsupported(msg) 636 #define fit_unsupported(msg)
635 #define fit_unsupported_reset(msg) 637 #define fit_unsupported_reset(msg)
636 #endif /* CONFIG_FIT_VERBOSE */ 638 #endif /* CONFIG_FIT_VERBOSE */
637 #endif /* CONFIG_FIT */ 639 #endif /* CONFIG_FIT */
638 640
639 #endif /* __IMAGE_H__ */ 641 #endif /* __IMAGE_H__ */
640 642