Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 75d3e8fbd93c14d9929d024c75af2d742c76db70

Authored by Marian Balakowicz
1 parent 20c9395933
Exists in master and in 55 other branches 8qm-imx_v2020.04_5.4.70_2.3.0, emb_lf_v2022.04, emb_lf_v2023.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

[new uImage] Pull in libfdt if CONFIG_FIT is enabled 

New uImage format (Flattened Image Tree) requires libfdt
functionality, print out error message if CONFIG_OF_LIBFDT
is not defined.

New uImage support is enabled by defining CONFIG_FIT (and CONFIG_OF_LIBFDT).
This commit turns it on by default.

Signed-off-by: Marian Balakowicz <m8@semihalf.com>

Showing 4 changed files with 12 additions and 3 deletions Side-by-side Diff

... ... @@ -114,7 +114,7 @@
114 114  
115 115 /* ------------------------------------------------------------------------- */
116 116  
117   -#ifdef CONFIG_OF_LIBFDT
  117 +#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
118 118 void ft_cpu_setup(void *blob, bd_t *bd)
119 119 {
120 120 int div = in_8((void*)CFG_MBAR + 0x204) & 0x0020 ? 8 : 4;
... ... @@ -300,7 +300,7 @@
300 300 #endif /* CONFIG_WATCHDOG */
301 301  
302 302 /* ------------------------------------------------------------------------- */
303   -#if defined(CONFIG_OF_LIBFDT)
  303 +#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
304 304 void ft_cpu_setup (void *blob, bd_t *bd)
305 305 {
306 306 char * cpu_path = "/cpus/" OF_CPU;
... ... @@ -638,7 +638,7 @@
638 638 #endif /* CONFIG_WATCHDOG */
639 639  
640 640 /* ------------------------------------------------------------------------- */
641   -#if defined(CONFIG_OF_LIBFDT)
  641 +#if defined(CONFIG_OF_LIBFDT) && defined (CONFIG_OF_BOARD_SETUP)
642 642 void ft_cpu_setup (void *blob, bd_t *bd)
643 643 {
644 644 char * cpu_path = "/cpus/" OF_CPU;
... ... @@ -35,10 +35,19 @@
35 35  
36 36 #include <asm/byteorder.h>
37 37 #include <command.h>
  38 +
38 39 #ifndef USE_HOSTCC
39 40 #include <linux/string.h>
40 41 #include <asm/u-boot.h>
  42 +
  43 +/* new uImage format support enabled by default */
  44 +#define CONFIG_FIT 1
  45 +#define CONFIG_OF_LIBFDT 1
  46 +
  47 +#if defined(CONFIG_FIT) && !defined(CONFIG_OF_LIBFDT)
  48 +#error "CONFIG_OF_LIBFDT not enabled, required by CONFIG_FIT!"
41 49 #endif
  50 +#endif /* USE_HOSTCC */
42 51  
43 52 /*
44 53 * Operating System Codes