Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 5769f671a9e5b21ed38cc98618235dac899bd401

Authored by Eric Lee
1 parent 89054a546f
Exists in smarc_8mm-imx_v2018.03_4.14.98_2.0.0_ga and in 3 other branches smarc-imx6_v2018.03_4.14.98_2.0.0_ga, smarc_8m-imx_v2018.03_4.14.98_2.0.0_ga, smarc_8m_00d0-imx_v2018.03_4.14.98_2.0.0_ga

Minor bugs fixed

Showing 18 changed files with 40 additions and 43 deletions Side-by-side Diff

board/embedian/smarcfimx6/smarcfimx6.c
Diff comments   View file @ 5769f67
... ... @@ -1346,22 +1346,22 @@
1346 1346 if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
1347 1347 puts("BOOT_SEL Detected: OFF OFF OFF, Load zImage from Carrier SATA...\n");
1348 1348 env_set("root", "/dev/sda1 rootwait rw ");
1349   - env_set("bootcmd", "sata init; run findfdt; run loadsataenv; run importbootenv; run uenvcmd; run loadsatazimage; run loadsatafdt; run sataboot;");
  1349 + env_set("bootcmd", "sata init; run loadsataenv; run importbootenv; run uenvcmd; run loadsatazimage; run loadsatafdt; run sataboot;");
1350 1350 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
1351 1351 puts("BOOT_SEL Detected: OFF OFF ON, USB Boot Up Not Defined...Carrier SPI Boot Not Supported...\n");
1352 1352 hang();
1353 1353 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
1354 1354 puts("BOOT_SEL Detected: OFF ON OFF, Load zImage from Carrier SDMMC...\n");
1355 1355 env_set_ulong("mmcdev", 1);
1356   - env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
  1356 + env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
1357 1357 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 0)) {
1358 1358 puts("BOOT_SEL Detected: ON OFF OFF, Load zImage from Carrier SD Card...\n");
1359 1359 env_set_ulong("mmcdev", 0);
1360   - env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
  1360 + env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
1361 1361 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
1362 1362 puts("BOOT_SEL Detected: OFF ON ON, Load zImage from Module eMMC Flash...\n");
1363 1363 env_set_ulong("mmcdev", 2);
1364   - env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
  1364 + env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
1365 1365 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 0)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
1366 1366 puts("BOOT_SEL Detected: ON OFF ON, Load zImage from GBE...\n");
1367 1367 env_set("bootcmd", "run netboot;");
... ... @@ -1371,7 +1371,7 @@
1371 1371 } else if ((gpio_get_value(IMX_GPIO_NR(1, 4)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 5)) == 1)&&(gpio_get_value(IMX_GPIO_NR(1, 6)) == 1)) {
1372 1372 puts("BOOT_SEL Detected: ON ON ON, MOdule SPI Boot up is Default, Load zImage from Module eMMC...\n");
1373 1373 env_set_ulong("mmcdev", 2);
1374   - env_set("bootcmd", "mmc rescan; run findfdt; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
  1374 + env_set("bootcmd", "mmc rescan; run loadbootenv; run importbootenv; run uenvcmd; run loadzimage; run loadfdt; run mmcboot;");
1375 1375 } else {
1376 1376 puts("unsupported boot devices\n");
1377 1377 hang();
configs/smarcfimx6_dl_1g_ser0_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser0_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser1_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser1_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser2_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser2_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser3_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_dl_1g_ser3_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser0_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser0_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser1_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser1_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser2_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser2_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser3_android_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
configs/smarcfimx6_solo_ser3_defconfig
Diff comments   View file @ 5769f67
... ... @@ -45,8 +45,8 @@
45 45 # CONFIG_VIDEO_SW_CURSOR is not set
46 46 CONFIG_OF_LIBFDT=y
47 47  
48   -CONFIG_DEFAULT_DEVICE_TREE="imx6q-smarcfimx6"
49   -CONFIG_DEFAULT_FDT_FILE="imx6q-smarcfimx6.dtb"
  48 +CONFIG_DEFAULT_DEVICE_TREE="imx6dl-smarcfimx6"
  49 +CONFIG_DEFAULT_FDT_FILE="imx6dl-smarcfimx6.dtb"
50 50 CONFIG_OF_CONTROL=y
51 51 CONFIG_DM_GPIO=y
52 52 CONFIG_DM_I2C=y
include/configs/smarcfimx6_common.h
Diff comments   View file @ 5769f67
... ... @@ -122,7 +122,7 @@
122 122 CONFIG_MFG_ENV_SETTINGS \
123 123 TEE_ENV \
124 124 "image=zImage\0" \
125   - "fdt_file=undefined\0" \" \
  125 + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \" \
126 126 "fdt_addr=0x18000000\0" \
127 127 "fdt_high=0xffffffff\0" \
128 128 "tee_addr=0x20000000\0" \
129 129  
... ... @@ -166,9 +166,8 @@
166 166 "bootargs_sata=setenv bootargs ${bootargs} " \
167 167 "root=/dev/sda2 rootwait rw \0" \
168 168 "bootcmd_sata=run bootargs_sata; sata init; " \
169   - "run findfdt; run findtee;" \
170 169 "fatload sata 0:1 ${loadaddr} ${image}; " \
171   - "fatload sata 0:1 ${fdt_addr} ${fdt_file}; " \
  170 + "fatload sata 0:1 ${fdt_addr} /dtbs/${fdt_file}; " \
172 171 "if test ${tee} = yes; then " \
173 172 "fatload sata 0:1 ${tee_addr} ${tee_file}; " \
174 173 "bootm ${tee_addr} - ${fdt_addr}; " \
... ... @@ -185,7 +184,7 @@
185 184 "epdc_waveform=epdc_splash.bin\0" \
186 185 "script=boot.scr\0" \
187 186 "image=zImage\0" \
188   - "fdt_file=undefined\0" \" \
  187 + "fdt_file=" CONFIG_DEFAULT_FDT_FILE "\0" \" \
189 188 "fdt_addr=0x18000000\0" \
190 189 "tee_addr=0x20000000\0" \
191 190 "tee_file=undefined\0" \
... ... @@ -353,8 +352,6 @@
353 352 "fi;\0" \
354 353  
355 354 #define CONFIG_BOOTCOMMAND \
356   - "run findfdt;" \
357   - "run findtee;" \
358 355 "if mmc rescan; then " \
359 356 "echo SD/MMC found on device ${mmcdev};" \
360 357 "if run loadbootenv; then " \