Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 57226221f4becb629026ad78b3be55fa3247fbeb

Authored by Luka Perkov
Committed by Prafulla Wadaskar
1 parent 4b0561d841
Exists in master and in 50 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, 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

kirkwood: ib62x0: use device tree and update config 

Signed-off-by: Luka Perkov <luka@openwrt.org>
CC: Prafulla Wadaskar <prafulla@marvell.com>
Acked-By: Prafulla Wadaskar <prafulla@marvell.com>

Showing 1 changed file with 23 additions and 15 deletions Side-by-side Diff

include/configs/ib62x0.h
Diff comments   View file @ 5722622
... ... @@ -28,6 +28,11 @@
28 28 #define CONFIG_MACH_TYPE MACH_TYPE_NAS6210
29 29  
30 30 /*
  31 + * Enable device tree support
  32 + */
  33 +#define CONFIG_OF_LIBFDT
  34 +
  35 +/*
31 36 * Compression configuration
32 37 */
33 38 #define CONFIG_BZIP2
... ... @@ -41,6 +46,7 @@
41 46 #define CONFIG_SYS_MVFS
42 47 #include <config_cmd_default.h>
43 48 #define CONFIG_CMD_ENV
  49 +#define CONFIG_CMD_BOOTZ
44 50 #define CONFIG_CMD_IDE
45 51 #define CONFIG_CMD_MII
46 52 #define CONFIG_CMD_NAND
... ... @@ -66,7 +72,7 @@
66 72 #define CONFIG_ENV_IS_NOWHERE
67 73 #endif
68 74 #define CONFIG_ENV_SIZE 0x20000
69   -#define CONFIG_ENV_OFFSET 0x80000
  75 +#define CONFIG_ENV_OFFSET 0xe0000
70 76  
71 77 /*
72 78 * Default environment variables
73 79  
74 80  
75 81  
76 82  
... ... @@ -74,24 +80,26 @@
74 80 #define CONFIG_BOOTCOMMAND \
75 81 "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \
76 82 "ubi part root; " \
77   - "ubifsmount ubi:root; " \
  83 + "ubifsmount ubi:rootfs; " \
78 84 "ubifsload 0x800000 ${kernel}; " \
79   - "ubifsload 0x1100000 ${initrd}; " \
80   - "bootm 0x800000 0x1100000"
  85 + "ubifsload 0x700000 ${fdt}; " \
  86 + "ubifsumount; " \
  87 + "fdt addr 0x700000; fdt resize; fdt chosen; " \
  88 + "bootz 0x800000 - 0x700000"
81 89  
82   -#define CONFIG_MTDPARTS \
83   - "mtdparts=orion_nand:" \
84   - "0x80000@0x0(uboot)," \
85   - "0x20000@0x80000(uboot_env)," \
86   - "-@0xa0000(root)\0"
  90 +#define CONFIG_MTDPARTS \
  91 + "mtdparts=orion_nand:" \
  92 + "0xe0000@0x0(uboot)," \
  93 + "0x20000@0xe0000(uboot_env)," \
  94 + "-@0x100000(root)\0"
87 95  
88   -#define CONFIG_EXTRA_ENV_SETTINGS \
  96 +#define CONFIG_EXTRA_ENV_SETTINGS \
89 97 "console=console=ttyS0,115200\0" \
90 98 "mtdids=nand0=orion_nand\0" \
91 99 "mtdparts="CONFIG_MTDPARTS \
92   - "kernel=/boot/uImage\0" \
93   - "initrd=/boot/uInitrd\0" \
94   - "bootargs_root=ubi.mtd=2 root=ubi0:root rootfstype=ubifs\0"
  100 + "kernel=/boot/zImage\0" \
  101 + "fdt=/boot/ib62x0.dtb\0" \
  102 + "bootargs_root=ubi.mtd=2 root=ubi0:rootfs rootfstype=ubifs rw\0"
95 103  
96 104 /*
97 105 * Ethernet driver configuration