Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5539e9eae4ae69ec8bd7c9653b1eaad3260e43f6

Authored by Ye Li
1 parent f2615026ca
Exists in smarc_8mq-imx_v2020.04_5.4.24_2.1.0 and in 3 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, smarc-8m-android-10.0.0_2.6.0, smarc_8mm-imx_v2020.04_5.4.24_2.1.0

MLK-21854-1 imx: Add uuu relevant environment 

Add the uuu environment to each board, when booting from USB, the
u-boot will use them by default

Signed-off-by: Ye Li <ye.li@nxp.com>
(cherry picked from commit e36e653ca2f5b0e879d84925219455790acaf2d2)

Showing 15 changed files with 187 additions and 159 deletions Side-by-side Diff

include/configs/imx8mm_evk.h
Diff comments   View file @ 5539e9e
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #include <linux/sizes.h>
10 10 #include <asm/arch/imx-regs.h>
  11 +#include "imx_env.h"
11 12  
12 13 #define CONFIG_SPL_MAX_SIZE (148 * 1024)
13 14 #define CONFIG_SYS_MONITOR_LEN SZ_512K
... ... @@ -50,6 +51,10 @@
50 51  
51 52 #endif
52 53  
  54 +#define CONFIG_CMD_READ
  55 +#define CONFIG_SERIAL_TAG
  56 +#define CONFIG_FASTBOOT_USB_DEV 0
  57 +
53 58 #define CONFIG_REMAKE_ELF
54 59 /* ENET Config */
55 60 /* ENET1 */
... ... @@ -64,7 +69,7 @@
64 69 #endif
65 70  
66 71 #ifdef CONFIG_NAND_BOOT
67   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs) "
  72 +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandfit),32m(nandkernel),16m(nanddtb),8m(nandtee),-(nandrootfs)"
68 73 #endif
69 74  
70 75 /*
71 76  
... ... @@ -80,9 +85,18 @@
80 85 "else run jh_netboot; fi; \0" \
81 86 "jh_netboot=mw 0x303d0518 0xff; setenv fdt_file fsl-imx8mm-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
82 87  
  88 +
  89 +#define CONFIG_MFG_ENV_SETTINGS \
  90 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  91 + "initrd_addr=0x43800000\0" \
  92 + "initrd_high=0xffffffffffffffff\0" \
  93 + "emmc_dev=2\0"\
  94 + "sd_dev=1\0" \
  95 +
83 96 /* Initial environment variables */
84 97 #if defined(CONFIG_NAND_BOOT)
85 98 #define CONFIG_EXTRA_ENV_SETTINGS \
  99 + CONFIG_MFG_ENV_SETTINGS \
86 100 "fdt_addr=0x43000000\0" \
87 101 "fdt_high=0xffffffffffffffff\0" \
88 102 "mtdparts=" MFG_NAND_PARTITION "\0" \
... ... @@ -97,6 +111,7 @@
97 111  
98 112 #else
99 113 #define CONFIG_EXTRA_ENV_SETTINGS \
  114 + CONFIG_MFG_ENV_SETTINGS \
100 115 JAILHOUSE_ENV \
101 116 "script=boot.scr\0" \
102 117 "image=Image\0" \
include/configs/imx8mq_evk.h
Diff comments   View file @ 5539e9e
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #include <linux/sizes.h>
10 10 #include <asm/arch/imx-regs.h>
  11 +#include "imx_env.h"
11 12  
12 13 #define CONFIG_SPL_MAX_SIZE (148 * 1024)
13 14 #define CONFIG_SYS_MONITOR_LEN (512 * 1024)
14 15  
... ... @@ -70,16 +71,12 @@
70 71 "jh_netboot=setenv fdt_file fsl-imx8mq-evk-root.dtb; setenv jh_clk clk_ignore_unused; run netboot; \0 "
71 72  
72 73 #define CONFIG_MFG_ENV_SETTINGS \
73   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
74   - "rdinit=/linuxrc " \
75   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
76   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
77   - "g_mass_storage.iSerialNumber=\"\" "\
78   - "clk_ignore_unused "\
79   - "\0" \
  74 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
80 75 "initrd_addr=0x43800000\0" \
81   - "initrd_high=0xffffffff\0" \
82   - "bootcmd_mfg=run mfgtool_args;booti ${loadaddr} ${initrd_addr} ${fdt_addr};\0" \
  76 + "initrd_high=0xffffffffffffffff\0" \
  77 + "emmc_dev=0\0"\
  78 + "sd_dev=1\0" \
  79 +
83 80 /* Initial environment variables */
84 81 #define CONFIG_EXTRA_ENV_SETTINGS \
85 82 CONFIG_MFG_ENV_SETTINGS \
86 83  
... ... @@ -210,7 +207,13 @@
210 207 #define CONFIG_USB_GADGET_MASS_STORAGE
211 208 #define CONFIG_USB_FUNCTION_MASS_STORAGE
212 209  
  210 +#define CONFIG_CMD_READ
  211 +
213 212 #endif
  213 +
  214 +#define CONFIG_SERIAL_TAG
  215 +#define CONFIG_FASTBOOT_USB_DEV 0
  216 +
214 217  
215 218 #define CONFIG_USB_MAX_CONTROLLER_COUNT 2
216 219  
include/configs/imx8qm_mek.h
Diff comments   View file @ 5539e9e
... ... @@ -8,6 +8,7 @@
8 8  
9 9 #include <linux/sizes.h>
10 10 #include <asm/arch/imx-regs.h>
  11 +#include "imx_env.h"
11 12  
12 13 #ifdef CONFIG_SPL_BUILD
13 14 #define CONFIG_SPL_MAX_SIZE (192 * 1024)
... ... @@ -43,6 +44,8 @@
43 44  
44 45 #define CONFIG_BOARD_EARLY_INIT_F
45 46  
  47 +#define CONFIG_CMD_READ
  48 +
46 49 /* Flat Device Tree Definitions */
47 50 #define CONFIG_OF_BOARD_SETUP
48 51  
49 52  
... ... @@ -139,8 +142,16 @@
139 142 #define MFG_NAND_PARTITION ""
140 143 #endif
141 144  
  145 +#define CONFIG_MFG_ENV_SETTINGS \
  146 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  147 + "initrd_addr=0x83100000\0" \
  148 + "initrd_high=0xffffffffffffffff\0" \
  149 + "emmc_dev=0\0" \
  150 + "sd_dev=1\0" \
  151 +
142 152 /* Initial environment variables */
143 153 #define CONFIG_EXTRA_ENV_SETTINGS \
  154 + CONFIG_MFG_ENV_SETTINGS \
144 155 M4_BOOT_ENV \
145 156 XEN_BOOT_ENV \
146 157 JAILHOUSE_ENV\
... ... @@ -155,8 +166,6 @@
155 166 "cntr_file=os_cntr_signed.bin\0" \
156 167 "boot_fdt=try\0" \
157 168 "fdt_file=undefined\0" \
158   - "initrd_addr=0x83100000\0" \
159   - "initrd_high=0xffffffffffffffff\0" \
160 169 "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
161 170 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
162 171 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
include/configs/imx8qxp_mek.h
Diff comments   View file @ 5539e9e
... ... @@ -9,6 +9,8 @@
9 9 #include <linux/sizes.h>
10 10 #include <asm/arch/imx-regs.h>
11 11  
  12 +#include "imx_env.h"
  13 +
12 14 #ifdef CONFIG_SPL_BUILD
13 15 #define CONFIG_SPL_MAX_SIZE (192 * 1024)
14 16 #define CONFIG_SYS_MONITOR_LEN (1024 * 1024)
... ... @@ -42,6 +44,8 @@
42 44  
43 45 #define CONFIG_BOARD_EARLY_INIT_F
44 46  
  47 +#define CONFIG_CMD_READ
  48 +
45 49 /* Flat Device Tree Definitions */
46 50 #define CONFIG_OF_BOARD_SETUP
47 51  
... ... @@ -71,6 +75,13 @@
71 75 "loadm4image_0=fatload mmc ${mmcdev}:${mmcpart} ${loadaddr} ${m4_0_image}\0" \
72 76 "m4boot_0=run loadm4image_0; dcache flush; bootaux ${loadaddr} 0\0" \
73 77  
  78 +#define CONFIG_MFG_ENV_SETTINGS \
  79 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  80 + "initrd_addr=0x83100000\0" \
  81 + "initrd_high=0xffffffffffffffff\0" \
  82 + "emmc_dev=0\0" \
  83 + "sd_dev=1\0" \
  84 +
74 85 #define JAILHOUSE_ENV \
75 86 "jh_mmcboot=" \
76 87 "setenv fdt_file fsl-imx8qxp-mek-root.dtb;"\
... ... @@ -113,6 +124,7 @@
113 124  
114 125 /* Initial environment variables */
115 126 #define CONFIG_EXTRA_ENV_SETTINGS \
  127 + CONFIG_MFG_ENV_SETTINGS \
116 128 M4_BOOT_ENV \
117 129 XEN_BOOT_ENV \
118 130 JAILHOUSE_ENV\
... ... @@ -127,8 +139,6 @@
127 139 "cntr_file=os_cntr_signed.bin\0" \
128 140 "boot_fdt=try\0" \
129 141 "fdt_file=undefined\0" \
130   - "initrd_addr=0x83100000\0" \
131   - "initrd_high=0xffffffffffffffff\0" \
132 142 "mmcdev="__stringify(CONFIG_SYS_MMC_ENV_DEV)"\0" \
133 143 "mmcpart=" __stringify(CONFIG_SYS_MMC_IMG_LOAD_PART) "\0" \
134 144 "mmcroot=" CONFIG_MMCROOT " rootwait rw\0" \
include/configs/imx_env.h
Diff comments   View file @ 5539e9e
  1 +/* Copyright 2018 NXP
  2 + *
  3 + * SPDX-License-Identifier: GPL-2.0+
  4 + */
  5 +
  6 +#ifndef __IMX_COMMON_CONFIG_H
  7 +#define __IMX_COMMON_CONFIG_H
  8 +
  9 +#ifdef CONFIG_ARM64
  10 + #define MFG_BOOT_CMD "booti "
  11 +#else
  12 + #define MFG_BOOT_CMD "bootz "
  13 +#endif
  14 +
  15 +#define CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  16 + "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
  17 + "rdinit=/linuxrc " \
  18 + "clk_ignore_unused "\
  19 + "\0" \
  20 + "kboot="MFG_BOOT_CMD"\0"\
  21 + "bootcmd_mfg=run mfgtool_args;" \
  22 + "if iminfo ${initrd_addr}; then " \
  23 + "if test ${tee} = yes; then " \
  24 + "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
  25 + "else " \
  26 + MFG_BOOT_CMD "${loadaddr} ${initrd_addr} ${fdt_addr}; " \
  27 + "fi; " \
  28 + "else " \
  29 + "echo \"Run fastboot ...\"; fastboot 0; " \
  30 + "fi;\0" \
  31 +
  32 +#endif
include/configs/mx6sabre_common.h
Diff comments   View file @ 5539e9e
... ... @@ -10,6 +10,7 @@
10 10 #define __MX6QSABRE_COMMON_CONFIG_H
11 11  
12 12 #include "mx6_common.h"
  13 +#include "imx_env.h"
13 14  
14 15 #define CONFIG_IMX_THERMAL
15 16  
16 17  
17 18  
... ... @@ -34,29 +35,27 @@
34 35 #endif
35 36  
36 37 #ifdef CONFIG_NAND_BOOT
37   -#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\;gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs) "
  38 +#define MFG_NAND_PARTITION "mtdparts=8000000.nor:1m(boot),-(rootfs)\\;gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
38 39 #else
39 40 #define MFG_NAND_PARTITION ""
40 41 #endif
41 42  
  43 +#define CONFIG_CMD_READ
  44 +#define CONFIG_SERIAL_TAG
  45 +#define CONFIG_FASTBOOT_USB_DEV 0
  46 +
42 47 #define CONFIG_MFG_ENV_SETTINGS \
43   - "mfgtool_args=setenv bootargs console=" CONSOLE_DEV ",115200 " \
44   - "rdinit=/linuxrc " \
45   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
46   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
47   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
48   - "g_mass_storage.iSerialNumber=\"\" "\
49   - "enable_wait_mode=off "\
50   - MFG_NAND_PARTITION \
51   - "\0" \
52   - "initrd_addr=0x12C00000\0" \
53   - "initrd_high=0xffffffff\0" \
54   - "bootcmd_mfg=run mfgtool_args; " \
55   - "if test ${tee} = yes; then " \
56   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
57   - "else " \
58   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
59   - "fi;\0"
  48 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  49 + "initrd_addr=0x12C00000\0" \
  50 + "initrd_high=0xffffffff\0" \
  51 + "emmc_dev=3\0"\
  52 + "sd_dev=2\0" \
  53 + "weim_uboot=0x08001000\0"\
  54 + "weim_base=0x08000000\0"\
  55 + "spi_bus=0\0"\
  56 + "spi_uboot=0x400\0" \
  57 + "mtdparts=" MFG_NAND_PARTITION \
  58 + "\0"\
60 59  
61 60 #ifdef CONFIG_SUPPORT_EMMC_BOOT
62 61 #define EMMC_ENV \
include/configs/mx6slevk.h
Diff comments   View file @ 5539e9e
... ... @@ -9,6 +9,7 @@
9 9 #define __CONFIG_H
10 10  
11 11 #include "mx6_common.h"
  12 +#include "imx_env.h"
12 13  
13 14 #ifdef CONFIG_SPL
14 15 #include "imx6_spl.h"
15 16  
16 17  
... ... @@ -48,22 +49,18 @@
48 49 #define CONFIG_FEC_XCV_TYPE RMII
49 50 #define CONFIG_ETHPRIME "eth0"
50 51  
  52 +#define CONFIG_CMD_READ
  53 +#define CONFIG_SERIAL_TAG
  54 +#define CONFIG_FASTBOOT_USB_DEV 0
  55 +
51 56 #define CONFIG_MFG_ENV_SETTINGS \
52   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
53   - "rdinit=/linuxrc " \
54   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
55   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
56   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
57   - "g_mass_storage.iSerialNumber=\"\" "\
58   - "\0" \
59   - "initrd_addr=0x83800000\0" \
  57 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  58 + "initrd_addr=0x86800000\0" \
60 59 "initrd_high=0xffffffff\0" \
61   - "bootcmd_mfg=run mfgtool_args;" \
62   - "if test ${tee} = yes; then " \
63   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
64   - "else " \
65   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
66   - "fi;\0"
  60 + "emmc_dev=2\0"\
  61 + "sd_dev=1\0" \
  62 + "spi_bus=1\0"\
  63 + "spi_uboot=0x400\0"
67 64  
68 65 #define CONFIG_EXTRA_ENV_SETTINGS \
69 66 CONFIG_MFG_ENV_SETTINGS \
include/configs/mx6sllevk.h
Diff comments   View file @ 5539e9e
... ... @@ -9,7 +9,12 @@
9 9 #define __CONFIG_H
10 10  
11 11 #include "mx6_common.h"
  12 +#include "imx_env.h"
12 13  
  14 +#define CONFIG_CMD_READ
  15 +#define CONFIG_SERIAL_TAG
  16 +#define CONFIG_FASTBOOT_USB_DEV 0
  17 +
13 18 /* Size of malloc() pool */
14 19 #define CONFIG_SYS_MALLOC_LEN (16 * SZ_1M)
15 20  
16 21  
... ... @@ -26,21 +31,11 @@
26 31 #endif
27 32  
28 33 #define CONFIG_MFG_ENV_SETTINGS \
29   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
30   - "rdinit=/linuxrc " \
31   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
32   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
33   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
34   - "g_mass_storage.iSerialNumber=\"\" "\
35   - "\0" \
36   - "initrd_addr=0x83800000\0" \
  34 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  35 + "initrd_addr=0x86800000\0" \
37 36 "initrd_high=0xffffffff\0" \
38   - "bootcmd_mfg=run mfgtool_args;" \
39   - "if test ${tee} = yes; then " \
40   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
41   - "else " \
42   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
43   - "fi;\0"
  37 + "emmc_dev=1\0"\
  38 + "sd_dev=0\0" \
44 39  
45 40 #define CONFIG_EXTRA_ENV_SETTINGS \
46 41 CONFIG_MFG_ENV_SETTINGS \
include/configs/mx6sxsabreauto.h
Diff comments   View file @ 5539e9e
... ... @@ -9,6 +9,7 @@
9 9 #define __CONFIG_H
10 10  
11 11 #include "mx6_common.h"
  12 +#include "imx_env.h"
12 13  
13 14 #define CONFIG_DBG_MONITOR
14 15  
... ... @@ -19,7 +20,7 @@
19 20 #define CONFIG_MXC_UART_BASE UART1_BASE
20 21  
21 22 #ifdef CONFIG_NAND_BOOT
22   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
  23 +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
23 24 #else
24 25 #define MFG_NAND_PARTITION ""
25 26 #endif
26 27  
... ... @@ -57,22 +58,12 @@
57 58  
58 59  
59 60 #define CONFIG_MFG_ENV_SETTINGS \
60   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
61   - "rdinit=/linuxrc " \
62   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
63   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
64   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
65   - "g_mass_storage.iSerialNumber=\"\" "\
66   - MFG_NAND_PARTITION \
67   - "\0" \
68   - "initrd_addr=0x83800000\0" \
  61 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  62 + "initrd_addr=0x86800000\0" \
69 63 "initrd_high=0xffffffff\0" \
70   - "bootcmd_mfg=run mfgtool_args; " \
71   - "if test ${tee} = yes; then " \
72   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
73   - "else " \
74   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
75   - "fi;\0"
  64 + "sd_dev=2\0" \
  65 + "mtdparts=" MFG_NAND_PARTITION \
  66 + "\0"\
76 67  
77 68 #if defined(CONFIG_NAND_BOOT)
78 69 #define CONFIG_EXTRA_ENV_SETTINGS \
... ... @@ -84,7 +75,7 @@
84 75 "fdt_high=0xffffffff\0" \
85 76 "console=ttymxc0\0" \
86 77 "bootargs=console=ttymxc0,115200 ubi.mtd=6 " \
87   - "root=ubi0:rootfs rootfstype=ubifs " \
  78 + "root=ubi0:nandrootfs rootfstype=ubifs " \
88 79 MFG_NAND_PARTITION \
89 80 "\0" \
90 81 "bootcmd=nand read ${loadaddr} 0x4000000 0xc00000;"\
... ... @@ -232,6 +223,8 @@
232 223 /* Network */
233 224 #define CONFIG_ETHPRIME "eth1"
234 225 #define CONFIG_FEC_XCV_TYPE RGMII
  226 +
  227 +#define CONFIG_SERIAL_TAG
235 228  
236 229 #ifdef CONFIG_CMD_USB
237 230 #define CONFIG_EHCI_HCD_INIT_AFTER_RESET
include/configs/mx6sxsabresd.h
Diff comments   View file @ 5539e9e
... ... @@ -10,6 +10,7 @@
10 10 #define __CONFIG_H
11 11  
12 12 #include "mx6_common.h"
  13 +#include "imx_env.h"
13 14  
14 15 #define CONFIG_DBG_MONITOR
15 16  
... ... @@ -23,6 +24,10 @@
23 24 #define CONFIG_MXC_UART
24 25 #define CONFIG_MXC_UART_BASE UART1_BASE
25 26  
  27 +#define CONFIG_CMD_READ
  28 +#define CONFIG_SERIAL_TAG
  29 +#define CONFIG_FASTBOOT_USB_DEV 0
  30 +
26 31 #ifdef CONFIG_IMX_BOOTAUX
27 32 /* Set to QSPI2 B flash at default */
28 33 #ifdef CONFIG_DM_SPI
29 34  
... ... @@ -62,21 +67,11 @@
62 67 #endif /* CONFIG_IMX_BOOTAUX */
63 68  
64 69 #define CONFIG_MFG_ENV_SETTINGS \
65   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
66   - "rdinit=/linuxrc " \
67   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
68   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
69   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
70   - "g_mass_storage.iSerialNumber=\"\" "\
71   - "\0" \
72   - "initrd_addr=0x83800000\0" \
  70 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  71 + "initrd_addr=0x86800000\0" \
73 72 "initrd_high=0xffffffff\0" \
74   - "bootcmd_mfg=run mfgtool_args; " \
75   - "if test ${tee} = yes; then " \
76   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
77   - "else " \
78   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
79   - "fi;\0"
  73 + "emmc_dev=3\0"\
  74 + "sd_dev=3\0" \
80 75  
81 76 #define CONFIG_EXTRA_ENV_SETTINGS \
82 77 CONFIG_MFG_ENV_SETTINGS \
include/configs/mx6ul_14x14_evk.h
Diff comments   View file @ 5539e9e
... ... @@ -12,6 +12,7 @@
12 12 #include <linux/sizes.h>
13 13 #include "mx6_common.h"
14 14 #include <asm/mach-imx/gpio.h>
  15 +#include "imx_env.h"
15 16  
16 17 /* uncomment for BEE support, needs to enable CONFIG_CMD_FUSE */
17 18 /* #define CONFIG_CMD_BEE */
18 19  
19 20  
20 21  
... ... @@ -61,30 +62,24 @@
61 62 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
62 63  
63 64 #ifdef CONFIG_NAND_BOOT
64   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
  65 +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
65 66 #else
66 67 #define MFG_NAND_PARTITION ""
67 68 #endif
68 69  
  70 +#define CONFIG_CMD_READ
  71 +#define CONFIG_SERIAL_TAG
  72 +#define CONFIG_FASTBOOT_USB_DEV 0
  73 +
69 74 #define CONFIG_MFG_ENV_SETTINGS \
70   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
71   - BOOTARGS_CMA_SIZE \
72   - "rdinit=/linuxrc " \
73   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
74   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
75   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
76   - "g_mass_storage.iSerialNumber=\"\" "\
77   - MFG_NAND_PARTITION \
78   - "clk_ignore_unused "\
79   - "\0" \
80   - "initrd_addr=0x83800000\0" \
  75 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  76 + "initrd_addr=0x86800000\0" \
81 77 "initrd_high=0xffffffff\0" \
82   - "bootcmd_mfg=run mfgtool_args; " \
83   - "if test ${tee} = yes; then " \
84   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
85   - "else " \
86   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
87   - "fi;\0"
  78 + "emmc_dev=1\0"\
  79 + "emmc_ack=1\0"\
  80 + "sd_dev=1\0" \
  81 + "mtdparts=" MFG_NAND_PARTITION \
  82 + "\0"\
88 83  
89 84 #if defined(CONFIG_NAND_BOOT)
90 85 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/mx6ullevk.h
Diff comments   View file @ 5539e9e
... ... @@ -13,6 +13,7 @@
13 13 #include <linux/sizes.h>
14 14 #include "mx6_common.h"
15 15 #include <asm/mach-imx/gpio.h>
  16 +#include "imx_env.h"
16 17  
17 18 #define is_mx6ull_9x9_evk() CONFIG_IS_ENABLED(TARGET_MX6ULL_9X9_EVK)
18 19  
19 20  
20 21  
21 22  
... ... @@ -55,30 +56,24 @@
55 56 #define CONFIG_SYS_MMC_IMG_LOAD_PART 1
56 57  
57 58 #ifdef CONFIG_NAND_BOOT
58   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
  59 +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
59 60 #else
60 61 #define MFG_NAND_PARTITION ""
61 62 #endif
62 63  
  64 +#define CONFIG_CMD_READ
  65 +#define CONFIG_SERIAL_TAG
  66 +#define CONFIG_FASTBOOT_USB_DEV 0
  67 +
63 68 #define CONFIG_MFG_ENV_SETTINGS \
64   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
65   - BOOTARGS_CMA_SIZE \
66   - "rdinit=/linuxrc " \
67   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
68   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
69   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
70   - "g_mass_storage.iSerialNumber=\"\" "\
71   - MFG_NAND_PARTITION \
72   - "clk_ignore_unused "\
73   - "\0" \
74   - "initrd_addr=0x83800000\0" \
  69 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  70 + "initrd_addr=0x86800000\0" \
75 71 "initrd_high=0xffffffff\0" \
76   - "bootcmd_mfg=run mfgtool_args; " \
77   - "if test ${tee} = yes; then " \
78   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
79   - "else " \
80   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
81   - "fi;\0"
  72 + "emmc_dev=1\0"\
  73 + "emmc_ack=1\0"\
  74 + "sd_dev=1\0" \
  75 + "mtdparts=" MFG_NAND_PARTITION \
  76 + "\0"\
82 77  
83 78 #if defined(CONFIG_NAND_BOOT)
84 79 #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/mx7dsabresd.h
Diff comments   View file @ 5539e9e
... ... @@ -10,6 +10,7 @@
10 10 #define __MX7D_SABRESD_CONFIG_H
11 11  
12 12 #include "mx7_common.h"
  13 +#include "imx_env.h"
13 14  
14 15 #define PHYS_SDRAM_SIZE SZ_1G
15 16  
16 17  
17 18  
18 19  
... ... @@ -58,28 +59,23 @@
58 59 #endif
59 60  
60 61 #ifdef CONFIG_NAND_BOOT
61   -#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(boot),16m(kernel),16m(dtb),16m(tee),-(rootfs) "
  62 +#define MFG_NAND_PARTITION "mtdparts=gpmi-nand:64m(nandboot),16m(nandkernel),16m(nanddtb),16m(nandtee),-(nandrootfs)"
62 63 #else
63 64 #define MFG_NAND_PARTITION ""
64 65 #endif
65 66  
  67 +#define CONFIG_CMD_READ
  68 +#define CONFIG_SERIAL_TAG
  69 +#define CONFIG_FASTBOOT_USB_DEV 0
  70 +
66 71 #define CONFIG_MFG_ENV_SETTINGS \
67   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
68   - "rdinit=/linuxrc " \
69   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
70   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
71   - "g_mass_storage.iSerialNumber=\"\" "\
72   - MFG_NAND_PARTITION \
73   - "clk_ignore_unused "\
74   - "\0" \
75   - "initrd_addr=0x83800000\0" \
  72 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  73 + "initrd_addr=0x86800000\0" \
76 74 "initrd_high=0xffffffff\0" \
77   - "bootcmd_mfg=run mfgtool_args; " \
78   - "if test ${tee} = yes; then " \
79   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
80   - "else " \
81   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
82   - "fi;\0"
  75 + "emmc_dev=2\0"\
  76 + "sd_dev=0\0" \
  77 + "mtdparts=" MFG_NAND_PARTITION \
  78 + "\0"\
83 79  
84 80 #define CONFIG_DFU_ENV_SETTINGS \
85 81 "dfu_alt_info=image raw 0 0x800000;"\
... ... @@ -97,7 +93,7 @@
97 93 "fdt_high=0xffffffff\0" \
98 94 "console=ttymxc0\0" \
99 95 "bootargs=console=ttymxc0,115200 ubi.mtd=4 " \
100   - "root=ubi0:rootfs rootfstype=ubifs " \
  96 + "root=ubi0:nandrootfs rootfstype=ubifs " \
101 97 MFG_NAND_PARTITION \
102 98 "\0" \
103 99 "bootcmd=nand read ${loadaddr} 0x4000000 0xc00000;"\
include/configs/mx7ulp_evk.h
Diff comments   View file @ 5539e9e
... ... @@ -10,10 +10,13 @@
10 10  
11 11 #include <linux/sizes.h>
12 12 #include <asm/arch/imx-regs.h>
  13 +#include "imx_env.h"
13 14  
14 15 #define CONFIG_BOARD_POSTCLK_INIT
15 16 #define CONFIG_SYS_BOOTM_LEN 0x1000000
16 17  
  18 +#define CONFIG_SERIAL_TAG
  19 +
17 20 #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC1 */
18 21 #define CONFIG_SYS_MMC_ENV_PART 0 /* user area */
19 22 #define CONFIG_MMCROOT "/dev/mmcblk0p2" /* USDHC1 */
... ... @@ -59,21 +62,11 @@
59 62 #define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + (PHYS_SDRAM_SIZE >> 1))
60 63  
61 64 #define CONFIG_MFG_ENV_SETTINGS \
62   - "mfgtool_args=setenv bootargs console=${console},${baudrate} " \
63   - "rdinit=/linuxrc " \
64   - "g_mass_storage.stall=0 g_mass_storage.removable=1 " \
65   - "g_mass_storage.file=/fat g_mass_storage.ro=1 " \
66   - "g_mass_storage.idVendor=0x066F g_mass_storage.idProduct=0x37FF "\
67   - "g_mass_storage.iSerialNumber=\"\" "\
68   - "\0" \
69   - "initrd_addr=0x63800000\0" \
70   - "initrd_high=0xffffffff\0" \
71   - "bootcmd_mfg=run mfgtool_args; " \
72   - "if test ${tee} = yes; then " \
73   - "bootm ${tee_addr} ${initrd_addr} ${fdt_addr}; " \
74   - "else " \
75   - "bootz ${loadaddr} ${initrd_addr} ${fdt_addr}; " \
76   - "fi;\0"
  65 + CONFIG_MFG_ENV_SETTINGS_DEFAULT \
  66 + "initrd_addr=0x66800000\0" \
  67 + "initrd_high=0xffffffff\0" \
  68 + "emmc_dev=0\0" \
  69 + "sd_dev=0\0"
77 70  
78 71 #define CONFIG_EXTRA_ENV_SETTINGS \
79 72 CONFIG_MFG_ENV_SETTINGS \
scripts/config_whitelist.txt
Diff comments   View file @ 5539e9e
... ... @@ -1096,6 +1096,7 @@
1096 1096 CONFIG_MEM_INIT_VALUE
1097 1097 CONFIG_MEM_REMAP
1098 1098 CONFIG_MFG_ENV_SETTINGS
  1099 +CONFIG_MFG_ENV_SETTINGS_DEFAULT
1099 1100 CONFIG_MIIM_ADDRESS
1100 1101 CONFIG_MII_DEFAULT_TSEC
1101 1102 CONFIG_MII_INIT