From: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> Add dedicated initcall for of_probe() which is required for the following device-on-demand/deep-probe mechanism. Signed-off-by: Marco Felsch <m.felsch@xxxxxxxxxxxxxx> Link: https://lore.pengutronix.de/20201021115813.31645-7-m.felsch@xxxxxxxxxxxxxx Signed-off-by: Sascha Hauer <s.hauer@xxxxxxxxxxxxxx> --- include/asm-generic/barebox.lds.h | 1 + include/init.h | 10 +++++++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/include/asm-generic/barebox.lds.h b/include/asm-generic/barebox.lds.h index 6971e2c1d2..a7d32160d1 100644 --- a/include/asm-generic/barebox.lds.h +++ b/include/asm-generic/barebox.lds.h @@ -33,6 +33,7 @@ KEEP(*(.initcall.12)) \ KEEP(*(.initcall.13)) \ KEEP(*(.initcall.14)) \ + KEEP(*(.initcall.15)) \ __barebox_initcalls_end = .; #define BAREBOX_EXITCALLS \ diff --git a/include/init.h b/include/init.h index 2d61bc8963..c695f99867 100644 --- a/include/init.h +++ b/include/init.h @@ -47,6 +47,9 @@ typedef void (*exitcall_t)(void); * initializes variables that couldn't be statically initialized. * * This only exists for built-in code, not for modules. + * + * The only purpose for "of_populate" is to call of_probe() other functions are + * not allowed. */ #define pure_initcall(fn) __define_initcall("0",fn,0) @@ -61,9 +64,10 @@ typedef void (*exitcall_t)(void); #define fs_initcall(fn) __define_initcall("9",fn,9) #define device_initcall(fn) __define_initcall("10",fn,10) #define crypto_initcall(fn) __define_initcall("11",fn,11) -#define late_initcall(fn) __define_initcall("12",fn,12) -#define environment_initcall(fn) __define_initcall("13",fn,13) -#define postenvironment_initcall(fn) __define_initcall("14",fn,14) +#define of_populate_initcall(fn) __define_initcall("12",fn,12) +#define late_initcall(fn) __define_initcall("13",fn,13) +#define environment_initcall(fn) __define_initcall("14",fn,14) +#define postenvironment_initcall(fn) __define_initcall("15",fn,15) #define early_exitcall(fn) __define_exitcall("0",fn,0) #define predevshutdown_exitcall(fn) __define_exitcall("1",fn,1) -- 2.29.2 _______________________________________________ barebox mailing list barebox@xxxxxxxxxxxxxxxxxxx http://lists.infradead.org/mailman/listinfo/barebox
