On Thu, Jul 11, 2013 at 5:03 PM, Nishanth Menon <n...@ti.com> wrote: > On 17:02-20130711, Robert Nelson wrote: >> On Thu, Jul 11, 2013 at 4:52 PM, Nishanth Menon <n...@ti.com> wrote: >> > For folks not using concatenated device tree with uImage, having >> > an handy function to find and load device tree is very handy. >> > >> > So introduce findfdt and loadfdt and run findfdt by default to make >> > it easier on user scripts. >> > >> > Signed-off-by: Nishanth Menon <n...@ti.com> >> > --- >> > include/configs/omap3_beagle.h | 17 +++++++++++++++++ >> > 1 file changed, 17 insertions(+) >> > >> > diff --git a/include/configs/omap3_beagle.h >> > b/include/configs/omap3_beagle.h >> > index bdeee17..7833208 100644 >> > --- a/include/configs/omap3_beagle.h >> > +++ b/include/configs/omap3_beagle.h >> > @@ -210,6 +210,8 @@ >> > #define CONFIG_EXTRA_ENV_SETTINGS \ >> > "loadaddr=0x80200000\0" \ >> > "rdaddr=0x81000000\0" \ >> > + "fdt_high=0xffffffff\0" \ >> > + "fdtaddr=0x80f80000\0" \ >> > "usbtty=cdc_acm\0" \ >> > "bootfile=uImage\0" \ >> > "ramdisk=ramdisk.gz\0" \ >> > @@ -250,6 +252,19 @@ >> > "omapdss.def_disp=${defaultdisplay} " \ >> > "root=${nandroot} " \ >> > "rootfstype=${nandrootfstype}\0" \ >> > + "findfdt=" \ >> > + "if test $beaglerev = AxBx; then " \ >> > + "setenv fdtfile omap3-beagle.dtb; fi; " \ >> > + "if test $beaglerev = Cx; then " \ >> > + "setenv fdtfile omap3-beagle.dtb; fi; " \ >> > + "if test $beaglerev = xMA; then " \ >> > + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ >> > + "if test $beaglerev = xMB; then " \ >> > + "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ >> >> There is no need for the "xMB" variant, as the gpio pins used for >> identification where never changed from the xMA when the newer silcon >> was used for the xMB (i guess if we look at the omap's es revision, we >> could figure out which are xMB's, but right now that isn't done in >> u-boot....) > I suppose then the following is ok to do as well? > diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c > index c686f40..6094b0f 100644 > --- a/board/ti/beagle/beagle.c > +++ b/board/ti/beagle/beagle.c > @@ -369,16 +369,6 @@ int misc_init_r(void) > TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, > TWL4030_PM_RECEIVER_DEV_GRP_P1); > break; > - case REVISION_XM_B: > - printf("Beagle xM Rev B\n"); > - setenv("beaglerev", "xMB"); > - MUX_BEAGLE_XM(); > - /* Set VAUX2 to 1.8V for EHCI PHY */ > - twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX2_DEDICATED, > - TWL4030_PM_RECEIVER_VAUX2_VSEL_18, > - TWL4030_PM_RECEIVER_VAUX2_DEV_GRP, > - TWL4030_PM_RECEIVER_DEV_GRP_P1); > - break; > case REVISION_XM_C: > printf("Beagle xM Rev C\n"); > setenv("beaglerev", "xMC");
Correct, as a cleanup we can nuke that xMB section.. For some bike shed paining we could rename: Beagle xM Rev A -> Beagle xM Rev A/B Above that too. ;) Regards, -- Robert Nelson http://www.rcn-ee.com/ _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot