mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-04-30 00:19:08 +00:00
u-boot 2011.09: switch to proper 2011.09 tag and add support for TCT beaconboard
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
@@ -5,14 +5,23 @@ Subject: [PATCH] beagleboard: add support for TCT Beacon board
|
|||||||
|
|
||||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||||
---
|
---
|
||||||
board/ti/beagle/beagle.c | 8 ++++++++
|
board/ti/beagle/beagle.c | 59 ++++++++++++++++++++++++++++++++++++++++
|
||||||
1 files changed, 8 insertions(+), 0 deletions(-)
|
board/ti/beagle/beagle.h | 7 +++++
|
||||||
|
include/configs/omap3_beagle.h | 7 +++++
|
||||||
|
3 files changed, 73 insertions(+), 0 deletions(-)
|
||||||
|
|
||||||
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
|
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
|
||||||
index 8cdceaf..be40e96 100644
|
index 8cdceaf..f4e986c 100644
|
||||||
--- a/board/ti/beagle/beagle.c
|
--- a/board/ti/beagle/beagle.c
|
||||||
+++ b/board/ti/beagle/beagle.c
|
+++ b/board/ti/beagle/beagle.c
|
||||||
@@ -62,6 +62,7 @@ extern volatile struct ehci_hcor *hcor;
|
@@ -57,11 +57,14 @@ extern volatile struct ehci_hcor *hcor;
|
||||||
|
#define TWL4030_I2C_BUS 0
|
||||||
|
#define EXPANSION_EEPROM_I2C_BUS 1
|
||||||
|
#define EXPANSION_EEPROM_I2C_ADDRESS 0x50
|
||||||
|
+#define DVI_EDID_I2C_BUS 2
|
||||||
|
+#define DVI_EDID_I2C_ADDRESS 0x50
|
||||||
|
|
||||||
|
#define TINCANTOOLS_ZIPPY 0x01000100
|
||||||
#define TINCANTOOLS_ZIPPY2 0x02000100
|
#define TINCANTOOLS_ZIPPY2 0x02000100
|
||||||
#define TINCANTOOLS_TRAINER 0x04000100
|
#define TINCANTOOLS_TRAINER 0x04000100
|
||||||
#define TINCANTOOLS_SHOWDOG 0x03000100
|
#define TINCANTOOLS_SHOWDOG 0x03000100
|
||||||
@@ -20,7 +29,7 @@ index 8cdceaf..be40e96 100644
|
|||||||
#define KBADC_BEAGLEFPGA 0x01000600
|
#define KBADC_BEAGLEFPGA 0x01000600
|
||||||
#define LW_BEAGLETOUCH 0x01000700
|
#define LW_BEAGLETOUCH 0x01000700
|
||||||
#define BRAINMUX_LCDOG 0x01000800
|
#define BRAINMUX_LCDOG 0x01000800
|
||||||
@@ -290,6 +291,13 @@ int misc_init_r(void)
|
@@ -290,6 +331,13 @@ int misc_init_r(void)
|
||||||
setenv("defaultdisplay", "showdoglcd");
|
setenv("defaultdisplay", "showdoglcd");
|
||||||
setenv("buddy", "showdog");
|
setenv("buddy", "showdog");
|
||||||
break;
|
break;
|
||||||
@@ -28,12 +37,27 @@ index 8cdceaf..be40e96 100644
|
|||||||
+ printf("Recognized Tincantools Beacon board (rev %d %s)\n",
|
+ printf("Recognized Tincantools Beacon board (rev %d %s)\n",
|
||||||
+ expansion_config.revision,
|
+ expansion_config.revision,
|
||||||
+ expansion_config.fab_revision);
|
+ expansion_config.fab_revision);
|
||||||
+ /* Place holder for DSS2 definition for showdog lcd */
|
+ MUX_TINCANTOOLS_BEACON();
|
||||||
+ setenv("buddy", "beacon");
|
+ setenv("buddy", "beacon");
|
||||||
+ break;
|
+ break;
|
||||||
case KBADC_BEAGLEFPGA:
|
case KBADC_BEAGLEFPGA:
|
||||||
printf("Recognized KBADC Beagle FPGA board\n");
|
printf("Recognized KBADC Beagle FPGA board\n");
|
||||||
MUX_KBADC_BEAGLEFPGA();
|
MUX_KBADC_BEAGLEFPGA();
|
||||||
--
|
diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
|
||||||
1.6.6.1
|
index 18bfaa8..6a9ad73 100644
|
||||||
|
--- a/board/ti/beagle/beagle.h
|
||||||
|
+++ b/board/ti/beagle/beagle.h
|
||||||
|
@@ -456,6 +456,13 @@ const omap3_sysinfo sysinfo = {
|
||||||
|
MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTU | EN | M4)) /*GPIO_141*/\
|
||||||
|
MUX_VAL(CP(MCBSP1_CLKX), (IEN | PTU | EN | M4)) /*GPIO_162*/
|
||||||
|
|
||||||
|
+#define MUX_TINCANTOOLS_BEACON() \
|
||||||
|
+ MUX_VAL(CP(MMC2_DAT3), (IEN | PTU | EN | M4)) /*GPIO_135*/\
|
||||||
|
+ MUX_VAL(CP(MMC2_DAT4), (IEN | PTU | EN | M4)) /*GPIO_136*/\
|
||||||
|
+ MUX_VAL(CP(MMC2_DAT5), (IEN | PTU | EN | M4)) /*GPIO_137*/\
|
||||||
|
+ MUX_VAL(CP(MMC2_DAT6), (IEN | PTU | EN | M4)) /*GPIO_138*/\
|
||||||
|
+ MUX_VAL(CP(MMC2_DAT7), (IEN | PTU | EN | M4)) /*GPIO_139*/\
|
||||||
|
+
|
||||||
|
#define MUX_KBADC_BEAGLEFPGA() \
|
||||||
|
MUX_VAL(CP(MCBSP1_CLKR), (IEN | PTU | DIS | M1)) /*MCSPI4_CLK*/\
|
||||||
|
MUX_VAL(CP(MCBSP1_DX), (IDIS | PTU | DIS | M1)) /*MCSPI4_SIMO*/\
|
||||||
|
|||||||
@@ -1,6 +1,6 @@
|
|||||||
require u-boot.inc
|
require u-boot.inc
|
||||||
|
|
||||||
PR = "r1"
|
PR = "r2"
|
||||||
|
|
||||||
# No patches for other machines yet
|
# No patches for other machines yet
|
||||||
COMPATIBLE_MACHINE = "(beagleboard)"
|
COMPATIBLE_MACHINE = "(beagleboard)"
|
||||||
@@ -9,14 +9,11 @@ SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \
|
|||||||
file://2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch \
|
file://2011.09/0001-HACK-beagleboard-config-disable-cache-for-USB.patch \
|
||||||
file://2011.09/0002-beagleboard-config-enable-gpio-command.patch \
|
file://2011.09/0002-beagleboard-config-enable-gpio-command.patch \
|
||||||
file://2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch \
|
file://2011.09/0003-Increased-some-timeout-durations-for-MMC-and-EHCI.patch \
|
||||||
file://2011.09/0001-beagleboard-probe-DDC-bus-for-expansionboard-EEPROMS.patch \
|
file://2011.09/0001-beagleboard-add-support-for-TCT-Beacon-board.patch \
|
||||||
file://fw_env.config \
|
file://fw_env.config \
|
||||||
"
|
"
|
||||||
# v2011.09 tag -> 6ceb0135f96d73063ffbaab5be7ce23933367388
|
|
||||||
# The tag below is from the master tree, but 21 patches after.
|
SRCREV = "1d5e7fb403257d62f0f2419cb83fdf6b0f02f215"
|
||||||
# $ git log 6ceb0135f..56fa45d58 | grep commit | wc -l
|
|
||||||
# 21
|
|
||||||
SRCREV = "56fa45d58116f86f343a9c45ce6d1110f50b8d70"
|
|
||||||
|
|
||||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
|
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user