Hi, there are only some little nitpicks... maybe not important.
On Thu, Nov 28, 2013 at 07:06:43PM +0100, Jean-Christophe PLAGNIOL-VILLARD wrote: > This will allow to do not check in each board which machine we are running > from. This work on DT & non-DT board. > > If only one board is enable autoselect it > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <[email protected]> > --- > arch/arm/cpu/Makefile | 2 +- > arch/arm/cpu/dtb.c | 8 +- > arch/arm/cpu/machine.c | 188 > +++++++++++++++++++++++++++++++++++++ > arch/arm/include/asm/barebox-arm.h | 8 ++ > arch/arm/include/asm/mach/arch.h | 68 ++++++++++++++ > arch/arm/lib/barebox.lds.S | 6 ++ > 6 files changed, 277 insertions(+), 3 deletions(-) > create mode 100644 arch/arm/cpu/machine.c > create mode 100644 arch/arm/include/asm/mach/arch.h > > diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile > index aba201b..78532da 100644 ... > + > +int is_dt_compatible(const struct machine_desc *m, const char* dt_compat) > +{ > + const char *const *dtc = m->dt_compat; const char *const *dtc? Looks like c ninja coding style :-D. I think you mean: const char **dtc = ... > + > + while (dtc) { > + const char *s = *dtc; > + if (dt_compat && !of_compat_cmp(s, dt_compat, > strlen(dt_compat))) > + return 1; > + else if (of_machine_is_compatible(s)) > + return 1; > + dtc++; > + } > + > + return 0; > +} > + > +int arm_set_dt_machine(const char* dt_compat) > +{ > + const struct machine_desc *m; > + > + for_each_machine_desc(m) { > + if (!is_dt_compatible(m, dt_compat)) > + continue; > + > + machine_desc = (const struct machine_desc *)m; > + if (m->nr != ~0) > + armlinux_set_architecture(m->nr); > + > + return 0; > + } > + > + return -ENOENT; > +} > + > +static void arm_mach_only_one_machine(void) > +{ > + const struct machine_desc *m; > + const struct machine_desc *tmp = NULL; > + > + for_each_machine_desc(m) { > + if (tmp) > + return; > + tmp = m; > + } > + > + if (!tmp) > + return; > + machine_desc = (const struct machine_desc *)tmp; > + armlinux_set_architecture(machine_desc->nr); > +} > + > +#define arm_mach_xx_init(level) > \ > +({ \ > + int __ret = 0; \ > + \ > + do { \ > + if (!machine_desc) \ > + break; \ > + \ > + if (machine_desc->level##_init) { \ > + __ret = machine_desc->level##_init(); \ > + if (__ret) \ > + break; \ > + } \ > + } while(0); \ > + __ret; \ > +}) > + > +static int arm_mach_pure_init(void) > +{ > + int ret = -EINVAL; > + > + if (__machine_arch_type != ~0 && __machine_arch_type < MAX_MACH_TYPE) > + ret = arm_set_machine(__machine_arch_type); > + if (ret) > + arm_mach_only_one_machine(); > + of_arm_init(); > + > + ret = arm_mach_xx_init(pure); > + > + return ret; unnecessary assignment to ret. - Alex _______________________________________________ barebox mailing list [email protected] http://lists.infradead.org/mailman/listinfo/barebox
