summaryrefslogtreecommitdiffstats
path: root/u-boot/board/goldelico/beagleb2/beagleb2.c
diff options
context:
space:
mode:
authorH. Nikolaus Schaller <hns@goldelico.com>2012-10-15 21:29:07 +0200
committerH. Nikolaus Schaller <hns@goldelico.com>2012-10-15 21:29:07 +0200
commitb77890ad73774bbce63e1b156ea149b1384af22b (patch)
treecec8ec2d08f0558224b5872785f1635c31c0a8d1 /u-boot/board/goldelico/beagleb2/beagleb2.c
parentf177d0d46e809388b8c4991ef8c425854c145841 (diff)
downloadbootable_bootloader_goldelico_gta04-b77890ad73774bbce63e1b156ea149b1384af22b.zip
bootable_bootloader_goldelico_gta04-b77890ad73774bbce63e1b156ea149b1384af22b.tar.gz
bootable_bootloader_goldelico_gta04-b77890ad73774bbce63e1b156ea149b1384af22b.tar.bz2
fixed order of setting PinMux to 1. BeagleBoard default, 2. BeagleBoard version specific (e.g. C4, XM), 3. GTA04 expansion board specific
Diffstat (limited to 'u-boot/board/goldelico/beagleb2/beagleb2.c')
-rw-r--r--u-boot/board/goldelico/beagleb2/beagleb2.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/u-boot/board/goldelico/beagleb2/beagleb2.c b/u-boot/board/goldelico/beagleb2/beagleb2.c
index 0f8387a..afc3b1c 100644
--- a/u-boot/board/goldelico/beagleb2/beagleb2.c
+++ b/u-boot/board/goldelico/beagleb2/beagleb2.c
@@ -11,14 +11,14 @@
// make us initialize using both pinmux sets
-void muxinit(void)
+int misc_init_r(void)
{
- MUX_BEAGLE();
- MUX_BEAGLE_EXPANDER();
+ my_misc_init_r(); // initializes board revision dependent mux (e.g. MUX_BEAGLE_C())
+ MUX_BEAGLE_EXPANDER(); // append our own pinmux
+ return 0;
}
-#undef MUX_BEAGLE
-#define MUX_BEAGLE() muxinit()
+#define misc_init_r my_misc_init_r
// take the original beagle.c code
#include "../../ti/beagle/beagle.c"