Hi! > socfpga: Consolidating reset code into reset_manager.c. Also separating > reset configuration for virtual target and real hardware Cyclone V > development kit > > Signed-off-by: Chin Liang See <cl...@altera.com>
> +++ b/arch/arm/cpu/armv7/socfpga/reset_manager.c > @@ -0,0 +1,50 @@ > +/* > + * Copyright Altera Corporation (C) <2013>. All rights reserved > + * > + * This program is free software; you can redistribute it and/or > +modify it > + * under the terms and conditions of the GNU General Public I sense some word wrapping... > @@ -21,6 +21,7 @@ > void reset_cpu(ulong addr); > void reset_deassert_peripherals_handoff(void); > > +#if defined(CONFIG_SOCFPGA_VIRTUAL_TARGET) > struct socfpga_reset_manager { > u32 padding1; > u32 ctrl; > @@ -31,7 +32,23 @@ struct socfpga_reset_manager { > u32 per2_mod_reset; > u32 brg_mod_reset; > }; > +#else > +struct socfpga_reset_manager { > + u32 status; > + u32 ctrl; > + u32 counts; > + u32 padding1; > + u32 mpu_mod_reset; > + u32 per_mod_reset; > + u32 per2_mod_reset; > + u32 brg_mod_reset; > +}; > +#endif > Is it really needed to have two definitions of the struct? AFAICT, structures are same, except that some padding fields have names on real hardware. Thus, if we simply use "real-hardware" version on the emulator, it should work. Perhaps with some comments "this is not emulated on virtual target"...? Thanks, Pavel -- (english) http://www.livejournal.com/~pavelmachek (cesky, pictures) http://atrey.karlin.mff.cuni.cz/~pavel/picture/horses/blog.html _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot