Eric Lee / smarc-uboot

Download as
Browse Code ยป

Commit 9660e442de66e7a80513b30e5226eeec73b9c17a

Authored by Helmut Raiger
Committed by Wolfgang Denk
1 parent deb5ca8027
Exists in master and in 54 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, 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

cosmetic: s/BOARD_LATE_INIT/CONFIG_BOARD_LATE_INIT 

This renames BOARD_LATE_INIT to CONFIG_BOARD_LATE_INIT.
Along the way it removes some leftover

 #define BOARD_LATE_INIT		1

and adds some basic documentation for board specific
callbacks in README.

Signed-off-by: Helmut Raiger <helmut.raiger@hale.at>
Acked-by: Stefano Babic <sbabic@denx.de>

Showing 34 changed files with 49 additions and 35 deletions Side-by-side Diff

... ... @@ -2447,6 +2447,20 @@
2447 2447  
2448 2448 See also: doc/README.Modem
2449 2449  
  2450 +Board initialization settings:
  2451 +------------------------------
  2452 +
  2453 +During Initialization u-boot calls a number of board specific functions
  2454 +to allow the preparation of board specific prerequisites, e.g. pin setup
  2455 +before drivers are initialized. To enable these callbacks the
  2456 +following configuration macros have to be defined. Currently this is
  2457 +architecture specific, so please check arch/your_architecture/lib/board.c
  2458 +typically in board_init_f() and board_init_r().
  2459 +
  2460 +- CONFIG_BOARD_EARLY_INIT_F: Call board_early_init_f()
  2461 +- CONFIG_BOARD_EARLY_INIT_R: Call board_early_init_r()
  2462 +- CONFIG_BOARD_LATE_INIT: Call board_late_init()
  2463 +- CONFIG_BOARD_POSTCLK_INIT: Call board_postclk_init()
2450 2464  
2451 2465 Configuration Settings:
2452 2466 -----------------------
arch/arm/lib/board.c
Diff comments   View file @ 9660e44
... ... @@ -590,7 +590,7 @@
590 590 }
591 591 #endif
592 592  
593   -#ifdef BOARD_LATE_INIT
  593 +#ifdef CONFIG_BOARD_LATE_INIT
594 594 board_late_init();
595 595 #endif
596 596  
arch/sandbox/lib/board.c
Diff comments   View file @ 9660e44
... ... @@ -250,7 +250,7 @@
250 250 /* enable exceptions */
251 251 enable_interrupts();
252 252  
253   -#ifdef BOARD_LATE_INIT
  253 +#ifdef CONFIG_BOARD_LATE_INIT
254 254 board_late_init();
255 255 #endif
256 256  
... ... @@ -141,7 +141,7 @@
141 141 stdio_init,
142 142 console_init_r,
143 143 interrupt_init,
144   -#ifdef BOARD_LATE_INIT
  144 +#ifdef CONFIG_BOARD_LATE_INIT
145 145 board_late_init,
146 146 #endif
147 147 #if defined(CONFIG_CMD_NET)
board/freescale/mx35pdk/mx35pdk.c
Diff comments   View file @ 9660e44
... ... @@ -38,8 +38,8 @@
38 38 #include <asm/arch/sys_proto.h>
39 39 #include <netdev.h>
40 40  
41   -#ifndef BOARD_LATE_INIT
42   -#error "BOARD_LATE_INIT must be set for this board"
  41 +#ifndef CONFIG_BOARD_LATE_INIT
  42 +#error "CONFIG_BOARD_LATE_INIT must be set for this board"
43 43 #endif
44 44  
45 45 #ifndef CONFIG_BOARD_EARLY_INIT_F
board/freescale/mx51evk/mx51evk.c
Diff comments   View file @ 9660e44
... ... @@ -409,7 +409,7 @@
409 409 return 0;
410 410 }
411 411  
412   -#ifdef BOARD_LATE_INIT
  412 +#ifdef CONFIG_BOARD_LATE_INIT
413 413 int board_late_init(void)
414 414 {
415 415 #ifdef CONFIG_MXC_SPI
board/imx31_phycore/imx31_phycore.c
Diff comments   View file @ 9660e44
... ... @@ -74,7 +74,7 @@
74 74 return 0;
75 75 }
76 76  
77   -#ifdef BOARD_LATE_INIT
  77 +#ifdef CONFIG_BOARD_LATE_INIT
78 78 int board_late_init(void)
79 79 {
80 80 #ifdef CONFIG_S6E63D6
board/st-ericsson/u8500/u8500_href.c
Diff comments   View file @ 9660e44
... ... @@ -226,7 +226,7 @@
226 226 0xA03FE024, 0x00000000 /* USB */
227 227 };
228 228  
229   -#ifdef BOARD_LATE_INIT
  229 +#ifdef CONFIG_BOARD_LATE_INIT
230 230 #ifdef CONFIG_MMC
231 231  
232 232 #define LDO_VAUX3_MASK 0x3
... ... @@ -351,7 +351,7 @@
351 351  
352 352 return 0;
353 353 }
354   -#endif /* BOARD_LATE_INIT */
  354 +#endif /* CONFIG_BOARD_LATE_INIT */
355 355  
356 356 static void early_gpio_setup(struct gpio_register *gpio_reg, u32 bits)
357 357 {
include/configs/VCMA9.h
Diff comments   View file @ 9660e44
... ... @@ -76,7 +76,7 @@
76 76 #define CONFIG_CMD_BSP
77 77 #define CONFIG_CMD_NAND
78 78  
79   -#define BOARD_LATE_INIT
  79 +#define CONFIG_BOARD_LATE_INIT
80 80  
81 81 #define CONFIG_SYS_HUSH_PARSER
82 82 #define CONFIG_SYS_PROMPT_HUSH_PS2 "> "
include/configs/cerf250.h
Diff comments   View file @ 9660e44
... ... @@ -36,7 +36,7 @@
36 36 */
37 37 #define CONFIG_PXA250 1 /* This is an PXA250 CPU */
38 38 #define CONFIG_CERF250 1 /* on Cerf PXA Board */
39   -#define BOARD_LATE_INIT 1
  39 +#define CONFIG_BOARD_LATE_INIT
40 40 #define CONFIG_BAUDRATE 38400
41 41 #define CONFIG_SYS_TEXT_BASE 0x0
42 42  
include/configs/colibri_pxa270.h
Diff comments   View file @ 9660e44
... ... @@ -28,7 +28,7 @@
28 28 #define CONFIG_PXA27X 1 /* Marvell PXA270 CPU */
29 29 #define CONFIG_VPAC270 1 /* Toradex Colibri PXA270 board */
30 30  
31   -#undef BOARD_LATE_INIT
  31 +#undef CONFIG_BOARD_LATE_INIT
32 32 #undef CONFIG_USE_IRQ
33 33 #undef CONFIG_SKIP_LOWLEVEL_INIT
34 34  
include/configs/efikamx.h
Diff comments   View file @ 9660e44
... ... @@ -79,7 +79,7 @@
79 79 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
80 80  
81 81 #define CONFIG_BOARD_EARLY_INIT_F
82   -#define BOARD_LATE_INIT
  82 +#define CONFIG_BOARD_LATE_INIT
83 83  
84 84 /*
85 85 * Hardware drivers
include/configs/imx31_phycore.h
Diff comments   View file @ 9660e44
... ... @@ -192,7 +192,7 @@
192 192  
193 193 /* EET platform additions */
194 194 #ifdef CONFIG_IMX31_PHYCORE_EET
195   -#define BOARD_LATE_INIT
  195 +#define CONFIG_BOARD_LATE_INIT
196 196  
197 197 #define CONFIG_MXC_GPIO
198 198  
include/configs/jadecpu.h
Diff comments   View file @ 9660e44
... ... @@ -51,7 +51,7 @@
51 51 #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */
52 52 #define CONFIG_SETUP_MEMORY_TAGS 1
53 53 #define CONFIG_INITRD_TAG 1
54   -#define BOARD_LATE_INIT 1
  54 +#define CONFIG_BOARD_LATE_INIT
55 55  
56 56 /*
57 57 * Compressions
include/configs/lubbock.h
Diff comments   View file @ 9660e44
... ... @@ -41,7 +41,7 @@
41 41 #define CONFIG_SHARP_LM8V31
42 42 #endif
43 43 #define CONFIG_MMC
44   -#define BOARD_LATE_INIT 1
  44 +#define CONFIG_BOARD_LATE_INIT
45 45 #define CONFIG_DOS_PARTITION
46 46 #define CONFIG_SYS_TEXT_BASE 0x0
47 47 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
include/configs/ms7750se.h
Diff comments   View file @ 9660e44
... ... @@ -45,7 +45,7 @@
45 45 #define CONFIG_SCIF_CONSOLE 1
46 46 #define CONFIG_BAUDRATE 38400
47 47 #define CONFIG_CONS_SCIF1 1
48   -#define BOARD_LATE_INIT 1
  48 +#define CONFIG_BOARD_LATE_INIT
49 49  
50 50 #define CONFIG_BOOTDELAY -1
51 51 #define CONFIG_BOOTARGS "console=ttySC0,38400"
include/configs/mx1ads.h
Diff comments   View file @ 9660e44
... ... @@ -45,7 +45,7 @@
45 45 /* #define _CONFIG_UART2 */ /* internal uart 2 */
46 46 /* #define CONFIG_SILENT_CONSOLE */ /* use this to disable output */
47 47  
48   -#define BOARD_LATE_INIT 1
  48 +#define CONFIG_BOARD_LATE_INIT
49 49 #define USE_920T_MMU 1
50 50  
51 51 #if 0
include/configs/mx31pdk.h
Diff comments   View file @ 9660e44
... ... @@ -102,7 +102,7 @@
102 102 */
103 103 #undef CONFIG_CMD_IMLS
104 104  
105   -#define BOARD_LATE_INIT
  105 +#define CONFIG_BOARD_LATE_INIT
106 106  
107 107 #define CONFIG_BOOTDELAY 3
108 108  
include/configs/mx35pdk.h
Diff comments   View file @ 9660e44
... ... @@ -42,7 +42,7 @@
42 42 #define CONFIG_SYS_64BIT_VSPRINTF
43 43  
44 44 #define CONFIG_BOARD_EARLY_INIT_F
45   -#define BOARD_LATE_INIT
  45 +#define CONFIG_BOARD_LATE_INIT
46 46  
47 47 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
48 48 #define CONFIG_REVISION_TAG
include/configs/mx51evk.h
Diff comments   View file @ 9660e44
... ... @@ -54,7 +54,7 @@
54 54 */
55 55 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
56 56  
57   -#define BOARD_LATE_INIT
  57 +#define CONFIG_BOARD_LATE_INIT
58 58  
59 59 /*
60 60 * Hardware drivers
include/configs/mx53evk.h
Diff comments   View file @ 9660e44
... ... @@ -44,7 +44,7 @@
44 44 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
45 45  
46 46 #define CONFIG_BOARD_EARLY_INIT_F
47   -#define BOARD_LATE_INIT
  47 +#define CONFIG_BOARD_LATE_INIT
48 48 #define CONFIG_MXC_GPIO
49 49  
50 50 #define CONFIG_MXC_UART
include/configs/nhk8815.h
Diff comments   View file @ 9660e44
... ... @@ -96,7 +96,7 @@
96 96 #define CONFIG_SYS_MEMTEST_END 0x0FFFFFFF
97 97 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 256 * 1024)
98 98  
99   -#define BOARD_LATE_INIT /* call board_late_init during start up */
  99 +#define CONFIG_BOARD_LATE_INIT /* call board_late_init during start up */
100 100  
101 101 /* timing informazion */
102 102 #define CONFIG_SYS_HZ 1000 /* Mandatory... */
include/configs/pleb2.h
Diff comments   View file @ 9660e44
... ... @@ -38,7 +38,7 @@
38 38 #define CONFIG_PLEB2 1 /* on an PLEB2 Board */
39 39 #undef CONFIG_LCD
40 40 #undef CONFIG_MMC
41   -#define BOARD_LATE_INIT 1
  41 +#define CONFIG_BOARD_LATE_INIT
42 42 #define CONFIG_SYS_TEXT_BASE 0x0
43 43  
44 44 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
include/configs/pxa255_idp.h
Diff comments   View file @ 9660e44
... ... @@ -64,7 +64,7 @@
64 64  
65 65 #define CONFIG_MMC 1
66 66 #define CONFIG_DOS_PARTITION 1
67   -#define BOARD_LATE_INIT 1
  67 +#define CONFIG_BOARD_LATE_INIT
68 68  
69 69 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
70 70  
include/configs/qong.h
Diff comments   View file @ 9660e44
... ... @@ -135,7 +135,7 @@
135 135 #define CONFIG_CMD_SETEXPR
136 136 #define CONFIG_CMD_SPI
137 137  
138   -#define BOARD_LATE_INIT
  138 +#define CONFIG_BOARD_LATE_INIT
139 139  
140 140 #define CONFIG_BOOTDELAY 5
141 141  
include/configs/r2dplus.h
Diff comments   View file @ 9660e44
... ... @@ -30,7 +30,7 @@
30 30 #define CONFIG_SCIF_CONSOLE 1
31 31 #define CONFIG_BAUDRATE 115200
32 32 #define CONFIG_CONS_SCIF1 1
33   -#define BOARD_LATE_INIT 1
  33 +#define CONFIG_BOARD_LATE_INIT
34 34  
35 35 #define CONFIG_BOOTDELAY -1
36 36 #define CONFIG_BOOTARGS "console=ttySC0,115200"
include/configs/sh7757lcr.h
Diff comments   View file @ 9660e44
... ... @@ -107,7 +107,7 @@
107 107 #define SH7757LCR_ETHERNET_MAC_BASE SH7757LCR_ETHERNET_MAC_BASE_SPI
108 108 #define SH7757LCR_ETHERNET_MAC_SIZE 17
109 109 #define SH7757LCR_ETHERNET_NUM_CH 2
110   -#define BOARD_LATE_INIT 1
  110 +#define CONFIG_BOARD_LATE_INIT
111 111  
112 112 /* Gigabit Ether */
113 113 #define SH7757LCR_GIGA_ETHERNET_NUM_CH 2
include/configs/trizepsiv.h
Diff comments   View file @ 9660e44
... ... @@ -43,7 +43,7 @@
43 43 #define CONFIG_PXA27X 1 /* This is an PXA27x CPU */
44 44  
45 45 #define CONFIG_MMC 1
46   -#define BOARD_LATE_INIT 1
  46 +#define CONFIG_BOARD_LATE_INIT
47 47 #define CONFIG_SYS_TEXT_BASE 0x0
48 48  
49 49 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
include/configs/tx25.h
Diff comments   View file @ 9660e44
... ... @@ -137,7 +137,7 @@
137 137 #define CONFIG_FEC_MXC_PHYADDR 0x1f
138 138 #define CONFIG_MII
139 139 #define CONFIG_CMD_NET
140   -#define BOARD_LATE_INIT
  140 +#define CONFIG_BOARD_LATE_INIT
141 141 #define CONFIG_ENV_OVERWRITE
142 142  
143 143 #define CONFIG_BOOTDELAY 5
include/configs/u8500_href.h
Diff comments   View file @ 9660e44
... ... @@ -35,7 +35,7 @@
35 35 #define CONFIG_SYS_HZ 1000 /* must be 1000 */
36 36  
37 37 #define CONFIG_BOARD_EARLY_INIT_F
38   -#define BOARD_LATE_INIT
  38 +#define CONFIG_BOARD_LATE_INIT
39 39  
40 40 /*
41 41 * Size of malloc() pool
include/configs/vision2.h
Diff comments   View file @ 9660e44
... ... @@ -39,7 +39,7 @@
39 39 #define CONFIG_REVISION_TAG
40 40 #define CONFIG_SETUP_MEMORY_TAGS
41 41 #define CONFIG_INITRD_TAG
42   -#define BOARD_LATE_INIT
  42 +#define CONFIG_BOARD_LATE_INIT
43 43  
44 44 #define CONFIG_MACH_TYPE MACH_TYPE_TTC_VISION2
45 45  
include/configs/xaeniax.h
Diff comments   View file @ 9660e44
... ... @@ -45,7 +45,7 @@
45 45 #define CONFIG_SYS_TEXT_BASE 0x0
46 46  
47 47  
48   -#define BOARD_LATE_INIT 1
  48 +#define CONFIG_BOARD_LATE_INIT
49 49  
50 50  
51 51 #undef CONFIG_USE_IRQ /* we don't need IRQ/FIQ stuff */
include/configs/zipitz2.h
Diff comments   View file @ 9660e44
... ... @@ -29,7 +29,7 @@
29 29 #define CONFIG_ZIPITZ2 1 /* Zipit Z2 board */
30 30 #define CONFIG_SYS_TEXT_BASE 0x0
31 31  
32   -#undef BOARD_LATE_INIT
  32 +#undef CONFIG_BOARD_LATE_INIT
33 33 #undef CONFIG_USE_IRQ
34 34 #undef CONFIG_SKIP_LOWLEVEL_INIT
35 35  
include/configs/zmx25.h
Diff comments   View file @ 9660e44
... ... @@ -46,7 +46,7 @@
46 46 #define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */
47 47 #define CONFIG_SETUP_MEMORY_TAGS
48 48 #define CONFIG_INITRD_TAG
49   -#define BOARD_LATE_INIT
  49 +#define CONFIG_BOARD_LATE_INIT
50 50  
51 51 /*
52 52 * Compressions