summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--u-boot/board/goldelico/beagleb1/beagleb1.c1
-rw-r--r--u-boot/board/goldelico/beagleb2/beagleb2.c1
-rw-r--r--u-boot/board/goldelico/beagleb4/beagleb4.c1
-rw-r--r--u-boot/board/goldelico/beagleb4/beagleb4.h2
-rw-r--r--u-boot/include/configs/omap3_beagle.h2
5 files changed, 6 insertions, 1 deletions
diff --git a/u-boot/board/goldelico/beagleb1/beagleb1.c b/u-boot/board/goldelico/beagleb1/beagleb1.c
index 2a6e8b7..28f08f2 100644
--- a/u-boot/board/goldelico/beagleb1/beagleb1.c
+++ b/u-boot/board/goldelico/beagleb1/beagleb1.c
@@ -13,6 +13,7 @@
int misc_init_r(void)
{
+ int my_misc_init_r();
my_misc_init_r(); // initializes board revision dependent mux (e.g. MUX_BEAGLE_C())
MUX_BEAGLE_EXPANDER(); // append our own pinmux
return 0;
diff --git a/u-boot/board/goldelico/beagleb2/beagleb2.c b/u-boot/board/goldelico/beagleb2/beagleb2.c
index afc3b1c..9c2a7ef 100644
--- a/u-boot/board/goldelico/beagleb2/beagleb2.c
+++ b/u-boot/board/goldelico/beagleb2/beagleb2.c
@@ -13,6 +13,7 @@
int misc_init_r(void)
{
+ int my_misc_init_r();
my_misc_init_r(); // initializes board revision dependent mux (e.g. MUX_BEAGLE_C())
MUX_BEAGLE_EXPANDER(); // append our own pinmux
return 0;
diff --git a/u-boot/board/goldelico/beagleb4/beagleb4.c b/u-boot/board/goldelico/beagleb4/beagleb4.c
index 86a7957..0385b7a 100644
--- a/u-boot/board/goldelico/beagleb4/beagleb4.c
+++ b/u-boot/board/goldelico/beagleb4/beagleb4.c
@@ -13,6 +13,7 @@
int misc_init_r(void)
{
+ int my_misc_init_r();
my_misc_init_r(); // initializes board revision dependent mux (e.g. MUX_BEAGLE_C())
MUX_BEAGLE_EXPANDER(); // append our own pinmux
return 0;
diff --git a/u-boot/board/goldelico/beagleb4/beagleb4.h b/u-boot/board/goldelico/beagleb4/beagleb4.h
index 098827d..b6705ef 100644
--- a/u-boot/board/goldelico/beagleb4/beagleb4.h
+++ b/u-boot/board/goldelico/beagleb4/beagleb4.h
@@ -33,7 +33,7 @@ MUX_VAL(CP(UART2_RX), (IDIS | PTD | DIS | M4)) /* NA GPIO_147 -
MUX_VAL(CP(MCBSP1_DX), (IDIS | PTD | EN | M4)) /* 12 GPIO_158 / McBSP1-DX - LVDS Display shutdown */\
MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTD | EN | M4)) /* 14 GPIO_162 / McBSP1-CLKX - unused */\
MUX_VAL(CP(MCBSP1_FSX), (IDIS | PTD | EN | M4)) /* 16 GPIO_161 / McBSP1-FSX - backlight shutdown */\
-MUX_VAL(CP(MCBSP1_DR), (IEN | PTD | EN | M4)) /* 18 GPIO_159 / McBSP1-DR - unused */\
+MUX_VAL(CP(MCBSP1_DR), (IEN | PTD | EN | M4)) /* 18 GPIO_159 / McBSP1-DR - controls EXT line for RS232 */\
MUX_VAL(CP(MCBSP1_CLKR), (IDIS | PTD | EN | M4)) /* 20 GPIO_156 / McBSP1-CLR - GPS ON/OFF */\
MUX_VAL(CP(MCBSP1_FSR), (IEN | PTU | EN | M4)) /* 22 GPIO_157 / McBSP1-FSR - PENIRQ */\
diff --git a/u-boot/include/configs/omap3_beagle.h b/u-boot/include/configs/omap3_beagle.h
index 438d865..519da79 100644
--- a/u-boot/include/configs/omap3_beagle.h
+++ b/u-boot/include/configs/omap3_beagle.h
@@ -322,6 +322,8 @@
#define CONFIG_ENV_OFFSET boot_flash_off
#define CONFIG_ENV_ADDR SMNAND_ENV_OFFSET
+#define CONFIG_START_WITH_DEFAULT_ENVIRONMENT 1
+
#ifndef __ASSEMBLY__
extern unsigned int boot_flash_base;
extern volatile unsigned int boot_flash_env_addr;