diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2013-09-04 14:06:56 +0200 |
| commit | e62d5fb0da76ef168e90cae9bbbda80349aaf137 (patch) | |
| tree | b5c338d17f0633b7ec2e27d4d8b82dcf153a5281 /board/ti/sdp4430/sdp.c | |
| parent | 4eef93da262048eb1118e726b3ec5b8ebd3c6c91 (diff) | |
| parent | 901ce27c6f018992b7dd6c08d3c98cf217cc4c96 (diff) | |
| download | talos-obmc-uboot-e62d5fb0da76ef168e90cae9bbbda80349aaf137.tar.gz talos-obmc-uboot-e62d5fb0da76ef168e90cae9bbbda80349aaf137.zip | |
Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'
Diffstat (limited to 'board/ti/sdp4430/sdp.c')
| -rw-r--r-- | board/ti/sdp4430/sdp.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 25daaa9ffb..79270a9e94 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -28,7 +28,6 @@ int board_init(void) { gpmc_init(); - gd->bd->bi_arch_number = MACH_TYPE_OMAP_4430SDP; gd->bd->bi_boot_params = (0x80000000 + 0x100); /* boot param addr */ return 0; @@ -66,7 +65,8 @@ void set_muxconf_regs_essential(void) sizeof(wkup_padconf_array_essential) / sizeof(struct pad_conf_entry)); - if (omap_revision() >= OMAP4460_ES1_0) + if ((omap_revision() >= OMAP4460_ES1_0) && + (omap_revision() < OMAP4470_ES1_0)) do_set_mux((*ctrl)->control_padconf_wkup_base, wkup_padconf_array_essential_4460, sizeof(wkup_padconf_array_essential_4460) / |
