diff options
| author | H. Nikolaus Schaller <hns@goldelico.com> | 2012-10-30 10:31:34 +0100 |
|---|---|---|
| committer | H. Nikolaus Schaller <hns@goldelico.com> | 2012-10-30 10:31:34 +0100 |
| commit | bda12bcf567b6a70ef4d1e122ffdd00afc726b79 (patch) | |
| tree | 0279b4d3c70814c9dd548137b66b405c0fcff1bc | |
| parent | f618daad4c3a0495fc894cd509a17b04631c4cd4 (diff) | |
| download | bootable_bootloader_goldelico_gta04-bda12bcf567b6a70ef4d1e122ffdd00afc726b79.zip bootable_bootloader_goldelico_gta04-bda12bcf567b6a70ef4d1e122ffdd00afc726b79.tar.gz bootable_bootloader_goldelico_gta04-bda12bcf567b6a70ef4d1e122ffdd00afc726b79.tar.bz2 | |
fixed sequence to apply the several pinmux macros so that we get what we want (default first, C4 modifications next, and finally the optional expansion board)
| -rw-r--r-- | u-boot/board/goldelico/beagleb1/beagleb1.c | 1 | ||||
| -rw-r--r-- | u-boot/board/goldelico/beagleb2/beagleb2.c | 1 | ||||
| -rw-r--r-- | u-boot/board/goldelico/beagleb4/beagleb4.c | 1 | ||||
| -rw-r--r-- | u-boot/board/goldelico/beagleb4/beagleb4.h | 2 | ||||
| -rw-r--r-- | u-boot/include/configs/omap3_beagle.h | 2 |
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; |