diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-07 09:32:16 +0100 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-11-07 09:32:16 +0100 |
| commit | 3285d4ca197928a048d3dda86751b5d26e6e0e86 (patch) | |
| tree | c1ab908fb4fac09839c672c765b98a0512d1e9d1 /arch/arm/include/asm/arch-mxs/sys_proto.h | |
| parent | c0e5dd88c438a41bf180dde0c2dc4c67dcd8058d (diff) | |
| parent | c93addb5635630847e8a33f6dba4afef78a6d180 (diff) | |
| download | u-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.zip u-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.tar.gz u-boot-imx-3285d4ca197928a048d3dda86751b5d26e6e0e86.tar.bz2 | |
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
Diffstat (limited to 'arch/arm/include/asm/arch-mxs/sys_proto.h')
| -rw-r--r-- | arch/arm/include/asm/arch-mxs/sys_proto.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/include/asm/arch-mxs/sys_proto.h b/arch/arm/include/asm/arch-mxs/sys_proto.h index 43c7dd6..09dfc90 100644 --- a/arch/arm/include/asm/arch-mxs/sys_proto.h +++ b/arch/arm/include/asm/arch-mxs/sys_proto.h @@ -46,6 +46,7 @@ static const struct mxs_pair mxs_boot_modes[] = { { 0x02, 0x1f, "SSP SPI #1, master, NOR" }, { 0x03, 0x1f, "SSP SPI #2, master, NOR" }, { 0x04, 0x1f, "NAND" }, + { 0x06, 0x1f, "JTAG" }, { 0x08, 0x1f, "SSP SPI #3, master, EEPROM" }, { 0x09, 0x1f, "SSP SD/MMC #0" }, { 0x0a, 0x1f, "SSP SD/MMC #1" }, @@ -60,6 +61,7 @@ static const struct mxs_pair mxs_boot_modes[] = { { 0x13, 0x1f, "SSP SPI #3, master, 1V8 NOR" }, { 0x04, 0x1f, "NAND, 3V3" }, { 0x14, 0x1f, "NAND, 1V8" }, + { 0x06, 0x1f, "JTAG" }, { 0x08, 0x1f, "SSP SPI #3, master, 3V3 EEPROM" }, { 0x18, 0x1f, "SSP SPI #3, master, 1V8 EEPROM" }, { 0x09, 0x1f, "SSP SD/MMC #0, 3V3" }, |