Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 314dd4fecc87175f6e79eb977966fb60b33c543c

Authored by Tom Rini
2 parents 5873d0fbad 617c246f3c
Exists in master and in 54 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, 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

Merge branch 'master' of git://git.denx.de/u-boot-x86

Showing 4 changed files Side-by-side Diff

arch/x86/cpu/coreboot/sdram.c
Diff comments   View file @ 314dd4f
... ... @@ -113,7 +113,7 @@
113 113 return 0;
114 114 }
115 115  
116   -int dram_init(void)
  116 +int dram_init_banksize(void)
117 117 {
118 118 int i, j;
119 119  
... ... @@ -131,5 +131,10 @@
131 131 }
132 132 }
133 133 return 0;
  134 +}
  135 +
  136 +int dram_init(void)
  137 +{
  138 + return dram_init_banksize();
134 139 }
... ... @@ -755,7 +755,7 @@
755 755 static init_fnc_t init_sequence_f[] = {
756 756 #if !defined(CONFIG_CPM2) && !defined(CONFIG_MPC512X) && \
757 757 !defined(CONFIG_MPC83xx) && !defined(CONFIG_MPC85xx) && \
758   - !defined(CONFIG_MPC86xx)
  758 + !defined(CONFIG_MPC86xx) && !defined(CONFIG_X86)
759 759 zero_global_data,
760 760 #endif
761 761 setup_fdt,
... ... @@ -856,8 +856,7 @@
856 856 #endif
857 857 #ifdef CONFIG_X86
858 858 dram_init_f, /* configure available RAM banks */
859   - /* x86 would prefer that this happens after relocation */
860   - dram_init,
  859 + calculate_relocation_address,
861 860 #endif
862 861 announce_dram_init,
863 862 /* TODO: unify all these dram functions? */
... ... @@ -722,9 +722,6 @@
722 722 #ifdef CONFIG_CLOCKS
723 723 set_cpu_clk_info, /* Setup clock information */
724 724 #endif
725   -#ifdef CONFIG_X86
726   - init_bd_struct_r,
727   -#endif
728 725 initr_reloc_global_data,
729 726 initr_serial,
730 727 initr_announce,
include/configs/coreboot.h
Diff comments   View file @ 314dd4f
... ... @@ -41,6 +41,7 @@
41 41 #define CONFIG_INTEL_CORE_ARCH /* Sandy bridge and ivy bridge chipsets. */
42 42 #define CONFIG_ZBOOT_32
43 43 #define CONFIG_PHYSMEM
  44 +#define CONFIG_SYS_EARLY_PCI_INIT
44 45  
45 46 #define CONFIG_LMB
46 47 #define CONFIG_OF_LIBFDT