fixed so that it compiles well (leaving only minor warnings)

14 files changed, 125 insertions, 786 deletions

diff --git a/board/overo/overo.c b/board/overo/overo.c
index 833ce8a..9c92693 100644
--- a/board/overo/overo.c
+++ b/board/overo/overo.c
@@ -40,32 +40,6 @@
 #include <asm/mach-types.h>
 #include "overo.h"
 
-static struct {
-	unsigned int device_vendor;
-	unsigned char revision;
-	unsigned char content;
-	unsigned char fab_revision[8];
-	unsigned char env_var[16];
-	unsigned char env_setting[64];
-} expansion_config;
-
-#define TWL4030_I2C_BUS			0
-
-#define EXPANSION_EEPROM_I2C_BUS	2
-#define EXPANSION_EEPROM_I2C_ADDRESS	0x51
-
-#define GUMSTIX_VENDORID		0x0200
-
-#define GUMSTIX_SUMMIT			0x01000200
-#define GUMSTIX_TOBI			0x02000200
-#define GUMSTIX_TOBI_DUO		0x03000200
-#define GUMSTIX_PALO35			0x04000200
-#define GUMSTIX_PALO43			0x05000200
-#define GUMSTIX_CHESTNUT43		0x06000200
-#define GUMSTIX_PINTO			0x07000200
-
-#define GUMSTIX_NO_EEPROM		0xffffffff
-
 #if defined(CONFIG_CMD_NET)
 static void setup_net_chip(void);
 #endif
@@ -99,8 +73,6 @@ int board_init(void)
 }
 
 /*
-<<<<<<< HEAD
-=======
  * Routine: get_board_revision
  * Description: Returns the board revision
  */
@@ -132,24 +104,16 @@ int get_board_revision(void)
 }
 
 /*
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
  * Routine: get_sdio2_config
  * Description: Return information about the wifi module connection
  *              Returns 0 if the module connects though a level translator
  *              Returns 1 if the module connects directly
  */
-<<<<<<< HEAD
-int get_sdio2_config(void) {
-	int sdio_direct;
-
-	if (!omap_request_gpio(130) && !omap_request_gpio(139)){
-=======
 int get_sdio2_config(void)
 {
 	int sdio_direct;
 
 	if (!omap_request_gpio(130) && !omap_request_gpio(139)) {
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
 
 		omap_set_gpio_direction(130, 0);
 		omap_set_gpio_direction(139, 1);
@@ -166,146 +130,18 @@ int get_sdio2_config(void)
 		omap_free_gpio(139);
 	} else {
 		printf("Error: unable to acquire sdio2 clk GPIOs\n");
-<<<<<<< HEAD
-		sdio_direct=-1;
-=======
 		sdio_direct = -1;
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
 	}
 
 	return sdio_direct;
 }
 
 /*
-<<<<<<< HEAD
- * Routine: get_board_revision
- * Description: Returns the board revision
- */
-int get_board_revision(void) {
-	int revision;
-
-	if (!omap_request_gpio(127) && !omap_request_gpio(128) &&
-	    !omap_request_gpio(129)){
-
-		omap_set_gpio_direction(127, 1);
-		omap_set_gpio_direction(128, 1);
-		omap_set_gpio_direction(129, 1);
-
-		revision = 0;
-		if (omap_get_gpio_datain(127) == 0)
-			revision += 1;
-		if (omap_get_gpio_datain(128) == 0)
-			revision += 2;
-		if (omap_get_gpio_datain(129) == 0)
-			revision += 4;
-
-		omap_free_gpio(127);
-		omap_free_gpio(128);
-		omap_free_gpio(129);
-	} else {
-		printf("Error: unable to acquire board revision GPIOs\n");
-		revision=-1;
-	}
-
-	return revision;
-}
-
-/*
- * Routine: get_expansion_id
- * Description: This function checks for expansion board by checking I2C
- *		bus 2 for the availability of an AT24C01B serial EEPROM.
- *		returns the device_vendor field from the EEPROM
- */
-unsigned int get_expansion_id(void)
-{
-	i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS);
-
-	/* return GUMSTIX_NO_EEPROM if eeprom doesn't respond */
-	if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1)
-		return GUMSTIX_NO_EEPROM;
-
-	/* read configuration data */
-	i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config,
-		 sizeof(expansion_config));
-
-	return expansion_config.device_vendor;
-}
-
-
-/*
-=======
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
  * Routine: misc_init_r
  * Description: Configure board specific parts
  */
 int misc_init_r(void)
 {
-	printf("Board revision: ");
-	switch (get_board_revision()) {
-		case 0:
-		case 1:
-			switch (get_sdio2_config()) {
-				case 0:
-					printf(" 0\n");
-					MUX_OVERO_SDIO2_TRANSCEIVER();
-					break;
-				case 1:
-					printf(" 1\n");
-					MUX_OVERO_SDIO2_DIRECT();
-					break;
-				default:
-					printf(" unknown\n");
-			}
-			break;
-		default:
-			printf(" unsupported\n");
-	}
-
-	switch (get_expansion_id()) {
-		case GUMSTIX_SUMMIT:
-			printf("Recognized Summit expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			setenv("defaultdisplay", "dvi");
-			break;
-		case GUMSTIX_TOBI:
-			printf("Recognized Tobi expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			setenv("defaultdisplay", "dvi");
-			break;
-		case GUMSTIX_TOBI_DUO:
-			printf("Recognized Tobi Duo expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			break;
-		case GUMSTIX_PALO35:
-			printf("Recognized Palo 35 expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			setenv("defaultdisplay", "lcd35");
-			break;
-		case GUMSTIX_PALO43:
-			printf("Recognized Palo 43 expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			setenv("defaultdisplay", "lcd43");
-			break;
-		case GUMSTIX_CHESTNUT43:
-			printf("Recognized Chestnut 43 expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			setenv("defaultdisplay", "lcd43");
-			break;
-		case GUMSTIX_PINTO:
-			printf("Recognized Pinto expansion board (rev %d %s)\n",
-				expansion_config.revision, expansion_config.fab_revision);
-			break;
-		case GUMSTIX_NO_EEPROM:
-			printf("No EEPROM on expansion board\n");
-			break;
-		default:
-			printf("Unrecognized expansion board\n");
-	}
-
-	if (expansion_config.content == 1)
-		setenv(expansion_config.env_var, expansion_config.env_setting);
-
-	i2c_set_bus_num(TWL4030_I2C_BUS);
 	twl4030_power_init();
 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
 
diff --git a/board/overo/overo.h b/board/overo/overo.h
index c1adc07..33a92e4 100644
--- a/board/overo/overo.h
+++ b/board/overo/overo.h
@@ -128,7 +128,7 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(GPMC_NCS6),		(IEN  | PTD | DIS | M0)) /*GPMC_nCS6*/\
 	MUX_VAL(CP(GPMC_NCS7),		(IEN  | PTU | EN  | M0)) /*GPMC_nCS7*/\
 	MUX_VAL(CP(GPMC_NBE1),		(IEN  | PTD | DIS | M0)) /*GPMC_nCS3*/\
-	MUX_VAL(CP(GPMC_CLK),		(IEN  | PTU | EN  | M0)) /*GPMC_CLK*/\
+	MUX_VAL(CP(GPMC_CLK),		(IDIS | PTU | EN  | M0)) /*GPMC_CLK*/\
 	MUX_VAL(CP(GPMC_NADV_ALE),	(IDIS | PTD | DIS | M0)) /*GPMC_nADV_ALE*/\
 	MUX_VAL(CP(GPMC_NOE),		(IDIS | PTD | DIS | M0)) /*GPMC_nOE*/\
 	MUX_VAL(CP(GPMC_NWE),		(IDIS | PTD | DIS | M0)) /*GPMC_nWE*/\
@@ -206,10 +206,10 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(MMC1_DAT1),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT1*/\
 	MUX_VAL(CP(MMC1_DAT2),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT2*/\
 	MUX_VAL(CP(MMC1_DAT3),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT3*/\
-	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M4)) /*GPIO_126*/\
-	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M4)) /*GPIO_127*/\
-	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M4)) /*GPIO_128*/\
-	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M4)) /*GPIO_129*/\
+	MUX_VAL(CP(MMC1_DAT4),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT4*/\
+	MUX_VAL(CP(MMC1_DAT5),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT5*/\
+	MUX_VAL(CP(MMC1_DAT6),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT6*/\
+	MUX_VAL(CP(MMC1_DAT7),		(IEN  | PTU | EN  | M0)) /*MMC1_DAT7*/\
  /*Wireless LAN */\
 	MUX_VAL(CP(MMC2_CLK),		(IEN  | PTU | EN  | M4)) /*GPIO_130*/\
 	MUX_VAL(CP(MMC2_CMD),		(IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
diff --git a/board/ti/beagle/Makefile b/board/ti/beagle/Makefile
index ae23b3c..50650bf 100644
--- a/board/ti/beagle/Makefile
+++ b/board/ti/beagle/Makefile
@@ -27,7 +27,6 @@ LIB	= $(obj)lib$(BOARD).a
 
 COBJS	:= beagle.o 
 COBJS-y	:= $(BOARD).o ../gta04/TD028TTEC1.o ../gta04/jbt6k74.o ../gta04/backlight.o ../gta04/status.o ../gta04/tsc2007.o ../gta04/dssfb.o ../gta04/gps.o ../gta04/commands.o
-COBJS-$(CONFIG_STATUS_LED) += led.o
 
 COBJS	:= $(sort $(COBJS-y))
 SRCS	:= $(COBJS:.o=.c)
diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
index 71ce5b1..4576e0b 100644
--- a/board/ti/beagle/beagle.c
+++ b/board/ti/beagle/beagle.c
@@ -66,8 +66,15 @@ int board_init(void)
 }
 
 /*
- * Routine: beagle_get_revision
- * Description: Return the revision of the BeagleBoard this code is running on.
+ * Routine: get_board_revision
+ * Description: Detect if we are running on a Beagle revision Ax/Bx,
+ *		C1/2/3, C4 or xM. This can be done by reading
+ *		the level of GPIO173, GPIO172 and GPIO171. This should
+ *		result in
+ *		GPIO173, GPIO172, GPIO171: 1 1 1 => Ax/Bx
+ *		GPIO173, GPIO172, GPIO171: 1 1 0 => C1/2/3
+ *		GPIO173, GPIO172, GPIO171: 1 0 1 => C4
+ *		GPIO173, GPIO172, GPIO171: 0 0 0 => xM
  */
 int get_board_revision(void)
 {
@@ -104,7 +111,8 @@ int misc_init_r(void)
 {
 	struct gpio *gpio5_base = (struct gpio *)OMAP34XX_GPIO5_BASE;
 	struct gpio *gpio6_base = (struct gpio *)OMAP34XX_GPIO6_BASE;
-
+	
+	extern void display_init(void);
 
 	switch (get_board_revision()) {
 	case REVISION_AXBX:
@@ -139,6 +147,11 @@ int misc_init_r(void)
 					TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
 					TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
 					TWL4030_PM_RECEIVER_DEV_GRP_P1);
+		/* Set VAUX1 to 3.3V for GTA04E display board */
+		twl4030_pmrecv_vsel_cfg(TWL4030_PM_RECEIVER_VAUX1_DEDICATED,
+					/*TWL4030_PM_RECEIVER_VAUX1_VSEL_33*/ 0x07,
+					TWL4030_PM_RECEIVER_VAUX1_DEV_GRP,
+					TWL4030_PM_RECEIVER_DEV_GRP_P1);
 		break;
 	default:
 		printf("Beagle unknown 0x%02x\n", get_board_revision());
@@ -146,6 +159,7 @@ int misc_init_r(void)
 
 	twl4030_power_init();
 	twl4030_led_init(TWL4030_LED_LEDEN_LEDAON | TWL4030_LED_LEDEN_LEDBON);
+
 	display_init();
 
 	/* Configure GPIOs to output */
@@ -160,7 +174,6 @@ int misc_init_r(void)
 		GPIO15 | GPIO14 | GPIO13 | GPIO12, &gpio5_base->setdataout);
 
 	dieid_num_r();
-	omap3_dss_enable();
 
 	return 0;
 }
diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h
index 0dfae01..37b9549 100644
--- a/board/ti/beagle/beagle.h
+++ b/board/ti/beagle/beagle.h
@@ -23,8 +23,6 @@
 #ifndef _BEAGLE_H_
 #define _BEAGLE_H_
 
-#include <asm/arch/dss.h>
-
 const omap3_sysinfo sysinfo = {
 	DDR_STACKED,
 	"OMAP3 Beagle board",
@@ -35,10 +33,6 @@ const omap3_sysinfo sysinfo = {
 #endif
 };
 
-<<<<<<< HEAD
-#define BOARD_REVISION_MASK	(0x1 << 11)
-=======
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
 /* BeagleBoard revisions */
 #define REVISION_AXBX	0x7
 #define REVISION_CX	0x6
@@ -241,11 +235,11 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(MCBSP4_FSX),		(IEN  | PTD | DIS | M1)) /*SSI1_WAKE*/\
 	MUX_VAL(CP(MCBSP1_CLKR),	(IDIS | PTD | DIS | M4)) /*GPIO_156 - GPS ON(0)/OFF(1)*/\
 	MUX_VAL(CP(MCBSP1_FSR),		(IEN  | PTU | EN  | M4)) /*GPIO_157 - PENIRQ */\
-	MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | EN  | M4)); /*GPIO_158 - DOUT */\
-	MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTU | DIS | M4)); /*GPIO_159 - DIN - pulled up */\
+	MUX_VAL(CP(MCBSP1_DX),		(IDIS | PTD | EN  | M4)) /*GPIO_158 - DOUT */\
+	MUX_VAL(CP(MCBSP1_DR),		(IEN  | PTU | DIS | M4)) /*GPIO_159 - DIN - pulled up */\
 	MUX_VAL(CP(MCBSP_CLKS),		(IEN  | PTU | DIS | M0)) /*McBSP_CLKS*/\
-	MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTU | EN  | M4)); /*GPIO_161 - CS */\
-	MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | EN  | M4)); /*GPIO_162 - SCL */\
+	MUX_VAL(CP(MCBSP1_FSX),		(IDIS | PTU | EN  | M4)) /*GPIO_161 - CS */\
+	MUX_VAL(CP(MCBSP1_CLKX),	(IDIS | PTD | EN  | M4)) /*GPIO_162 - SCL */\
  /*Serial Interface*/\
 	MUX_VAL(CP(UART3_CTS_RCTX),	(IEN  | PTD | EN  | M0)) /*UART3_CTS_RCTX*/\
 	MUX_VAL(CP(UART3_RTS_SD),	(IDIS | PTD | DIS | M0)) /*UART3_RTS_SD */\
@@ -392,17 +386,10 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(UART2_TX),		(IDIS | PTD | DIS | M0)) /*UART2_TX*/
 
 #define MUX_BEAGLE_XM() \
-<<<<<<< HEAD
 	MUX_VAL(CP(GPMC_NCS5),		(IDIS | PTD | EN  | M4)) /*GPIO_56 - USB HUB reset*/\
 	MUX_VAL(CP(GPMC_WAIT0),		(IDIS | PTU | EN  | M4)) /*GPIO_63 - P8 USB HUB nreset*/\
 	MUX_VAL(CP(MMC1_DAT7),		(IDIS | PTU | EN  | M4)) /*GPIO_129 - DVI enable*/\
 	MUX_VAL(CP(HDQ_SIO),		(IDIS | PTU | EN  | M4)) /*GPIO_170 - P8 DVI enable*/\
-=======
-	MUX_VAL(CP(GPMC_NCS5),		(IDIS | PTD | EN  | M4)) /*GPIO_56*/\
-	MUX_VAL(CP(GPMC_WAIT0),		(IDIS | PTU | EN  | M4)) /*GPIO_63*/\
-	MUX_VAL(CP(MMC1_DAT7),		(IDIS | PTU | EN  | M4)) /*GPIO_129*/\
-	MUX_VAL(CP(HDQ_SIO),		(IDIS | PTU | EN  | M4)) /*GPIO_170*/\
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
 	MUX_VAL(CP(MCBSP3_DX),		(IEN  | PTD | DIS | M4)) /*GPIO_140*/\
 	MUX_VAL(CP(MCBSP3_DR),		(IEN  | PTD | DIS | M4)) /*GPIO_142*/\
 	MUX_VAL(CP(MCBSP3_CLKX),	(IEN  | PTD | DIS | M4)) /*GPIO_141*/\
@@ -426,124 +413,6 @@ const omap3_sysinfo sysinfo = {
 	MUX_VAL(CP(SYS_BOOT3),		(IDIS | PTD | DIS | M3)) /*DSS_DATA20*/\
 	MUX_VAL(CP(SYS_BOOT4),		(IDIS | PTD | DIS | M3)) /*DSS_DATA21*/\
 	MUX_VAL(CP(SYS_BOOT5),		(IDIS | PTD | DIS | M3)) /*DSS_DATA22*/\
-<<<<<<< HEAD
 	MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M3)) /*DSS_DATA23*/ 
 
-#define MUX_TINCANTOOLS_ZIPPY() \
-	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M0)) /*MMC2_CLK*/\
-	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M0)) /*MMC2_CMD*/\
-	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT0*/\
-	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT1*/\
-	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT2*/\
-	MUX_VAL(CP(MMC2_DAT3),      (IEN  | PTU | EN  | M0)) /*MMC2_DAT3*/\
-	MUX_VAL(CP(MMC2_DAT4),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT0*/\
-	MUX_VAL(CP(MMC2_DAT5),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_DAT1*/\
-	MUX_VAL(CP(MMC2_DAT6),      (IEN  | PTU | EN  | M1)) /*MMC2_DIR_CMD*/\
-	MUX_VAL(CP(MMC2_DAT7),      (IEN  | PTU | EN  | M1)) /*MMC2_CLKIN*/\
-	MUX_VAL(CP(MCBSP1_CLKR),    (IEN  | PTU | EN  | M1)) /*MCSPI4_CLK*/\
-	MUX_VAL(CP(MCBSP1_FSR),     (IEN  | PTU | EN  | M4)) /*GPIO_157*/\
-	MUX_VAL(CP(MCBSP1_DX),      (IEN  | PTD | EN  | M1)) /*MCSPI4_SIMO*/\
-	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTD | DIS | M1)) /*MCSPI4_SOMI*/\
-	MUX_VAL(CP(MCBSP1_FSX),     (IEN  | PTD | EN  | M1)) /*MCSPI4_CS0*/\
-	MUX_VAL(CP(MCBSP1_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_162*/\
-	MUX_VAL(CP(MCBSP3_DX),      (IEN  | PTD | DIS | M4)) /*GPIO_140*/\
-	MUX_VAL(CP(MCBSP3_DR),      (IEN  | PTD | DIS | M4)) /*GPIO_142*/\
-	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTD | DIS | M4)) /*GPIO_141*/
-
-#define MUX_TINCANTOOLS_TRAINER() \
-	MUX_VAL(CP(MMC2_CLK),       (IEN  | PTU | EN  | M4)) /*GPIO_130*/\
-	MUX_VAL(CP(MMC2_CMD),       (IEN  | PTU | EN  | M4)) /*GPIO_131*/\
-	MUX_VAL(CP(MMC2_DAT0),      (IEN  | PTU | EN  | M4)) /*GPIO_132*/\
-	MUX_VAL(CP(MMC2_DAT1),      (IEN  | PTU | EN  | M4)) /*GPIO_133*/\
-	MUX_VAL(CP(MMC2_DAT2),      (IEN  | PTU | EN  | M4)) /*GPIO_134*/\
-	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*/\
-	MUX_VAL(CP(MCBSP3_DX),      (IEN  | PTU | EN  | M4)) /*GPIO_140*/\
-	MUX_VAL(CP(MCBSP3_CLKX),    (IEN  | PTU | EN  | M4)) /*GPIO_141*/
-
-#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*/\
-	MUX_VAL(CP(MCBSP1_DR),      (IEN  | PTU | EN  | M1)) /*MCSPI4_SOMI*/\
-	MUX_VAL(CP(MCBSP1_FSX),     (IDIS | PTU | DIS | M1)) /*MCSPI4_CS0*/\
-
-/*
- * Display Configuration
- */
-
-#define DVI_BEAGLE_ORANGE_COL		0x00FF8000
-#define VENC_HEIGHT			0x00ef
-#define VENC_WIDTH			0x027f
-
-/*
- * Configure VENC in DSS for Beagle to generate Color Bar
- *
- * Kindly refer to OMAP TRM for definition of these values.
- */
-static const struct venc_regs venc_config_std_tv = {
-	.status					= 0x0000001B,
-	.f_control				= 0x00000040,
-	.vidout_ctrl				= 0x00000000,
-	.sync_ctrl				= 0x00008000,
-	.llen					= 0x00008359,
-	.flens					= 0x0000020C,
-	.hfltr_ctrl				= 0x00000000,
-	.cc_carr_wss_carr			= 0x043F2631,
-	.c_phase				= 0x00000024,
-	.gain_u					= 0x00000130,
-	.gain_v					= 0x00000198,
-	.gain_y					= 0x000001C0,
-	.black_level				= 0x0000006A,
-	.blank_level				= 0x0000005C,
-	.x_color				= 0x00000000,
-	.m_control				= 0x00000001,
-	.bstamp_wss_data			= 0x0000003F,
-	.s_carr					= 0x21F07C1F,
-	.line21					= 0x00000000,
-	.ln_sel					= 0x00000015,
-	.l21__wc_ctl				= 0x00001400,
-	.htrigger_vtrigger			= 0x00000000,
-	.savid__eavid				= 0x069300F4,
-	.flen__fal				= 0x0016020C,
-	.lal__phase_reset			= 0x00060107,
-	.hs_int_start_stop_x			= 0x008D034E,
-	.hs_ext_start_stop_x			= 0x000F0359,
-	.vs_int_start_x				= 0x01A00000,
-	.vs_int_stop_x__vs_int_start_y		= 0x020501A0,
-	.vs_int_stop_y__vs_ext_start_x		= 0x01AC0024,
-	.vs_ext_stop_x__vs_ext_start_y		= 0x020D01AC,
-	.vs_ext_stop_y				= 0x00000006,
-	.avid_start_stop_x			= 0x03480079,
-	.avid_start_stop_y			= 0x02040024,
-	.fid_int_start_x__fid_int_start_y	= 0x0001008A,
-	.fid_int_offset_y__fid_ext_start_x	= 0x01AC0106,
-	.fid_ext_start_y__fid_ext_offset_y	= 0x01060006,
-	.tvdetgp_int_start_stop_x		= 0x00140001,
-	.tvdetgp_int_start_stop_y		= 0x00010001,
-	.gen_ctrl				= 0x00FF0000,
-	.output_control				= 0x0000000D,
-	.dac_b__dac_c				= 0x00000000
-};
-
-/*
- * Configure Timings for DVI D
- */
-static const struct panel_config dvid_cfg = {
-	.timing_h	= 0x0ff03f31, /* Horizantal timing */
-	.timing_v	= 0x01400504, /* Vertical timing */
-	.pol_freq	= 0x00007028, /* Pol Freq */
-	.divisor	= 0x00010006, /* 72Mhz Pixel Clock */
-	.lcd_size	= 0x02ff03ff, /* 1024x768 */
-	.panel_type	= 0x01, /* TFT */
-	.data_lines	= 0x03, /* 24 Bit RGB */
-	.load_mode	= 0x02, /* Frame Mode */
-	.panel_color	= DVI_BEAGLE_ORANGE_COL /* ORANGE */
-};
-=======
-	MUX_VAL(CP(SYS_BOOT6),		(IDIS | PTD | DIS | M3)) /*DSS_DATA23*/
->>>>>>> 11c8dd36edcc82564a19dbd0103302df66d66db0
-
 #endif
diff --git a/board/ti/beagle/led.c b/board/ti/beagle/led.c
deleted file mode 100644
index df26552..0000000
--- a/board/ti/beagle/led.c
+++ /dev/null
@@ -1,91 +0,0 @@
-/*
- * Copyright (c) 2010 Texas Instruments, Inc.
- * Jason Kridner <jkridner@beagleboard.org>
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-#include <common.h>
-#include <status_led.h>
-#include <asm/arch/cpu.h>
-#include <asm/io.h>
-#include <asm/arch/sys_proto.h>
-#include <asm/arch/gpio.h>
-
-static unsigned int saved_state[2] = {STATUS_LED_OFF, STATUS_LED_OFF};
-
-/* GPIO pins for the LEDs */
-#define BEAGLE_LED_USR0	149
-#define BEAGLE_LED_USR1	150
-
-#ifdef STATUS_LED_GREEN
-void green_LED_off (void)
-{
-	__led_set (STATUS_LED_GREEN, 0);
-}
-
-void green_LED_on (void)
-{
-	__led_set (STATUS_LED_GREEN, 1);
-}
-#endif
-
-void __led_init (led_id_t mask, int state)
-{
-	__led_set (mask, state);
-}
-
-void __led_toggle (led_id_t mask)
-{
-#ifdef STATUS_LED_BIT
-	if (STATUS_LED_BIT & mask) {
-		if (STATUS_LED_ON == saved_state[0])
-			__led_set(STATUS_LED_BIT, 0);
-		else
-			__led_set(STATUS_LED_BIT, 1);
-	}
-#endif
-#ifdef STATUS_LED_BIT1
-	if (STATUS_LED_BIT1 & mask) {
-		if (STATUS_LED_ON == saved_state[1])
-			__led_set(STATUS_LED_BIT1, 0);
-		else
-			__led_set(STATUS_LED_BIT1, 1);
-	}
-#endif
-}
-
-void __led_set (led_id_t mask, int state)
-{
-#ifdef STATUS_LED_BIT
-	if (STATUS_LED_BIT & mask) {
-		if (!omap_request_gpio(BEAGLE_LED_USR0)) {
-			omap_set_gpio_direction(BEAGLE_LED_USR0, 0);
-			omap_set_gpio_dataout(BEAGLE_LED_USR0, state);
-		}
-		saved_state[0] = state;
-	}
-#endif
-#ifdef STATUS_LED_BIT1
-	if (STATUS_LED_BIT1 & mask) {
-		if (!omap_request_gpio(BEAGLE_LED_USR1)) {
-			omap_set_gpio_direction(BEAGLE_LED_USR1, 0);
-			omap_set_gpio_dataout(BEAGLE_LED_USR1, state);
-		}
-		saved_state[1] = state;
-	}
-#endif
-}
-
diff --git a/board/ti/gta04/dssfb.c b/board/ti/gta04/dssfb.c
index 2546625..582afc7 100644
--- a/board/ti/gta04/dssfb.c
+++ b/board/ti/gta04/dssfb.c
@@ -180,8 +180,92 @@ int omap3_set_color(u32 color)
 	return 0;
 }
 
+/*
+ * Display Configuration
+ */
+
+#define DVI_BEAGLE_ORANGE_COL		0x00FF8000
+#define VENC_HEIGHT			0x00ef
+#define VENC_WIDTH			0x027f
+
+/*
+ * Configure VENC in DSS for Beagle to generate Color Bar
+ *
+ * Kindly refer to OMAP TRM for definition of these values.
+ */
+static const struct venc_regs venc_config_std_tv = {
+	.status					= 0x0000001B,
+	.f_control				= 0x00000040,
+	.vidout_ctrl				= 0x00000000,
+	.sync_ctrl				= 0x00008000,
+	.llen					= 0x00008359,
+	.flens					= 0x0000020C,
+	.hfltr_ctrl				= 0x00000000,
+	.cc_carr_wss_carr			= 0x043F2631,
+	.c_phase				= 0x00000024,
+	.gain_u					= 0x00000130,
+	.gain_v					= 0x00000198,
+	.gain_y					= 0x000001C0,
+	.black_level				= 0x0000006A,
+	.blank_level				= 0x0000005C,
+	.x_color				= 0x00000000,
+	.m_control				= 0x00000001,
+	.bstamp_wss_data			= 0x0000003F,
+	.s_carr					= 0x21F07C1F,
+	.line21					= 0x00000000,
+	.ln_sel					= 0x00000015,
+	.l21__wc_ctl				= 0x00001400,
+	.htrigger_vtrigger			= 0x00000000,
+	.savid__eavid				= 0x069300F4,
+	.flen__fal				= 0x0016020C,
+	.lal__phase_reset			= 0x00060107,
+	.hs_int_start_stop_x			= 0x008D034E,
+	.hs_ext_start_stop_x			= 0x000F0359,
+	.vs_int_start_x				= 0x01A00000,
+	.vs_int_stop_x__vs_int_start_y		= 0x020501A0,
+	.vs_int_stop_y__vs_ext_start_x		= 0x01AC0024,
+	.vs_ext_stop_x__vs_ext_start_y		= 0x020D01AC,
+	.vs_ext_stop_y				= 0x00000006,
+	.avid_start_stop_x			= 0x03480079,
+	.avid_start_stop_y			= 0x02040024,
+	.fid_int_start_x__fid_int_start_y	= 0x0001008A,
+	.fid_int_offset_y__fid_ext_start_x	= 0x01AC0106,
+	.fid_ext_start_y__fid_ext_offset_y	= 0x01060006,
+	.tvdetgp_int_start_stop_x		= 0x00140001,
+	.tvdetgp_int_start_stop_y		= 0x00010001,
+	.gen_ctrl				= 0x00FF0000,
+	.output_control				= 0x0000000D,
+	.dac_b__dac_c				= 0x00000000
+};
+
+/*
+ * Configure Timings for DVI D
+ */
+static const struct panel_config dvid_cfg = {
+	.timing_h	= 0x0ff03f31, /* Horizantal timing */
+	.timing_v	= 0x01400504, /* Vertical timing */
+	.pol_freq	= 0x00007028, /* Pol Freq */
+	.divisor	= 0x00010006, /* 72Mhz Pixel Clock */
+	.lcd_size	= 0x02ff03ff, /* 1024x768 */
+	.panel_type	= 0x01, /* TFT */
+	.data_lines	= 0x03, /* 24 Bit RGB */
+	.load_mode	= 0x02, /* Frame Mode */
+	.panel_color	= DVI_BEAGLE_ORANGE_COL /* ORANGE */
+};
+
 void dssfb_init(void)
 {
 	omap3_dss_panel_config(&lcm_cfg);	// set new config
 	omap3_dss_enable();	// and (re)enable
-}	
+}
+
+/*
+ * Configure DSS to display background color on DVID
+ * Configure VENC to display color bar on S-Video
+ */
+void display_init(void)
+{
+	omap3_dss_venc_config(&venc_config_std_tv, VENC_HEIGHT, VENC_WIDTH);
+	omap3_dss_panel_config(&dvid_cfg);
+}
+
diff --git a/board/ti/gta04/status.c b/board/ti/gta04/status.c
index e0d5e80..db2f65e 100644
--- a/board/ti/gta04/status.c
+++ b/board/ti/gta04/status.c
@@ -34,6 +34,7 @@ static int isGTA04 = 0;
 
 // we can't include "beagle.h"
 /* BeagleBoard revisions */
+extern int get_board_revision(void); 
 #define REVISION_AXBX	0x7
 #define REVISION_CX	0x6
 #define REVISION_C4	0x5
@@ -87,7 +88,7 @@ int led_get_buttons(void)
 
 int led_init(void)
 {
-	isXM = (beagle_get_revision() == REVISION_XM);
+	isXM = (get_board_revision() == REVISION_XM);
 	
 	if(!isGTA04) {
 		if(isXM) { // XM has scrambled dss assignment with respect to default ball name
diff --git a/common/Makefile b/common/Makefile
index 40facb5..2c37073 100644
--- a/common/Makefile
+++ b/common/Makefile
@@ -107,7 +107,6 @@ COBJS-$(CONFIG_CMD_IRQ) += cmd_irq.o
 COBJS-$(CONFIG_CMD_ITEST) += cmd_itest.o
 COBJS-$(CONFIG_CMD_JFFS2) += cmd_jffs2.o
 COBJS-$(CONFIG_CMD_CRAMFS) += cmd_cramfs.o
-COBJS-$(CONFIG_CMD_LED) += cmd_led.o
 COBJS-$(CONFIG_CMD_LICENSE) += cmd_license.o
 COBJS-y += cmd_load.o
 COBJS-$(CONFIG_LOGBUFFER) += cmd_log.o
diff --git a/common/cmd_led.c b/common/cmd_led.c
deleted file mode 100644
index 3b7b534..0000000
--- a/common/cmd_led.c
+++ /dev/null
@@ -1,207 +0,0 @@
-/*
- * (C) Copyright 2010
- * Jason Kridner <jkridner@beagleboard.org>
- *
- * Based on cmd_led.c patch from:
- * http://www.mail-archive.com/u-boot@lists.denx.de/msg06873.html
- * (C) Copyright 2008
- * Ulf Samuelsson <ulf.samuelsson@atmel.com>
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation; either version 2 of
- * the License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.	 See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-/*
- * This file provides a shell like 'test' function to return
- * true/false from an integer or string compare of two memory
- * locations or a location and a scalar/literal.
- * A few parts were lifted from bash 'test' command
- */
-
-#include <common.h>
-#include <config.h>
-#include <command.h>
-#include <status_led.h>
-
-int do_led ( cmd_tbl_t *cmdtp, int flag, int argc, char *argv[] )
-{
-#ifdef CONFIG_BOARD_SPECIFIC_LED
-	led_id_t mask;
-#endif
-	int state;
-
-	/* Validate arguments */
-	if ((argc != 3)){
-		printf("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
-
-	if (strcmp(argv[2], "off") == 0) {
-		state = 0;
-	} else if (strcmp(argv[2], "on") == 0) {
-		state = 1;
-	} else {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
-
-#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	if (strcmp(argv[1], "0") == 0) {
-		mask = STATUS_LED_BIT;
-		__led_set(mask, state);
-	}
-	else
-#endif
-#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	if (strcmp(argv[1], "1") == 0) {
-		mask = STATUS_LED_BIT1;
-		__led_set(mask, state);
-	}
-	else
-#endif
-#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	if (strcmp(argv[1], "2") == 0) {
-		mask = STATUS_LED_BIT2;
-		__led_set(mask, state);
-	}
-	else
-#endif
-#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	if (strcmp(argv[1], "3") == 0) {
-		mask = STATUS_LED_BIT3;
-		__led_set(mask, state);
-	}
-	else
-#endif
-#ifdef STATUS_LED_RED
-	if (strcmp(argv[1], "red") == 0) {
-		if (state == 0)
-			red_LED_off();
-		else
-			red_LED_on();
-	}
-	else
-#endif
-#ifdef STATUS_LED_GREEN
-	if (strcmp(argv[1], "green") == 0) {
-		if (state == 0)
-			green_LED_off();
-		else
-			green_LED_on();
-	}
-	else
-#endif
-#ifdef STATUS_LED_YELLOW
-	if (strcmp(argv[1], "yellow") == 0) {
-		if (state == 0)
-			yellow_LED_off();
-		else
-			yellow_LED_on();
-	}
-	else
-#endif
-#ifdef STATUS_LED_BLUE
-	if (strcmp(argv[1], "blue") == 0) {
-		if (state == 0)
-			blue_LED_off();
-		else
-			blue_LED_on();
-	}
-	else
-#endif
-	if (strcmp(argv[1], "all") == 0) {
-		mask = 0
-#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED)
-			| STATUS_LED_BIT
-#endif
-#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED)
-			| STATUS_LED_BIT1
-#endif
-#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED)
-			| STATUS_LED_BIT2
-#endif
-#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED)
-			| STATUS_LED_BIT3
-#endif
-			;
-#ifdef CONFIG_BOARD_SPECIFIC_LED
-		__led_set(mask, state);
-#endif
-#ifdef STATUS_LED_RED
-		if (state == 0)
-			red_LED_off();
-		else
-			red_LED_on();
-#endif
-#ifdef STATUS_LED_GREEN
-		if (state == 0)
-			green_LED_off();
-		else
-			green_LED_on();
-#endif
-#ifdef STATUS_LED_YELLOW
-		if (state == 0)
-			yellow_LED_off();
-		else
-			yellow_LED_on();
-#endif
-#ifdef STATUS_LED_BLUE
-		if (state == 0)
-			blue_LED_off();
-		else
-			blue_LED_on();
-#endif
-	} else {
-		printf ("Usage:\n%s\n", cmdtp->usage);
-		return 1;
-	}
-
-	return 0;
-}
-
-U_BOOT_CMD(
-	led, 3, 1, do_led,
-	"led\t- ["
-#if defined(STATUS_LED_BIT) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	"0|"
-#endif
-#if defined(STATUS_LED_BIT1) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	"1|"
-#endif
-#if defined(STATUS_LED_BIT2) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	"2|"
-#endif
-#if defined(STATUS_LED_BIT3) && defined(CONFIG_BOARD_SPECIFIC_LED)
-	"3|"
-#endif
-#ifdef STATUS_LED_GREEN
-	"green|"
-#endif
-#ifdef STATUS_LED_YELLOW
-	"yellow|"
-#endif
-#ifdef STATUS_LED_RED
-	"red|"
-#endif
-#ifdef STATUS_LED_BLUE
-	"blue|"
-#endif
-	"all] [on|off]\n",
-	"led [led_name] [on|off] sets or clears led(s)\n"
-);
-
diff --git a/drivers/video/Makefile b/drivers/video/Makefile
index 4be82e7..e9325bb 100644
--- a/drivers/video/Makefile
+++ b/drivers/video/Makefile
@@ -39,6 +39,7 @@ COBJS-$(CONFIG_SED156X) += sed156x.o
 COBJS-$(CONFIG_VIDEO_SM501) += sm501.o
 COBJS-$(CONFIG_VIDEO_SMI_LYNXEM) += smiLynxEM.o videomodes.o
 COBJS-$(CONFIG_VIDEO_VCXK) += bus_vcxk.o
+COBJS-$(CONFIG_VIDEO_OMAP3) += omap3_dss.o
 
 COBJS	:= $(COBJS-y)
 SRCS	:= $(COBJS:.o=.c)
diff --git a/include/asm-arm/arch-omap3/dss.h b/include/asm-arm/arch-omap3/dss.h
deleted file mode 100644
index e5e3b0d..0000000
--- a/include/asm-arm/arch-omap3/dss.h
+++ /dev/null
@@ -1,173 +0,0 @@
-/*
- * (C) Copyright 2010
- * Texas Instruments, <www.ti.com>
- * Syed Mohammed Khasim <khasim@ti.com>
- *
- * Referred to Linux DSS driver files for OMAP3
- *
- * See file CREDITS for list of people who contributed to this
- * project.
- *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License as
- * published by the Free Software Foundation's version 2 of
- * the License.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston,
- * MA 02111-1307 USA
- */
-
-#ifndef DSS_H
-#define DSS_H
-
-/*
- * DSS Base Registers
- */
-#define OMAP3_DSS_BASE		0x48050040
-#define OMAP3_DISPC_BASE	0x48050440
-#define OMAP3_VENC_BASE		0x48050C00
-
-/* DSS Registers */
-struct dss_regs {
-	u32 control;				/* 0x40 */
-	u32 sdi_control;			/* 0x44 */
-	u32 pll_control;			/* 0x48 */
-};
-
-/* DISPC Registers */
-struct dispc_regs {
-	u32 control;				/* 0x40 */
-	u32 config;				/* 0x44 */
-	u32 reserve_2;				/* 0x48 */
-	u32 default_color0;			/* 0x4C */
-	u32 default_color1;			/* 0x50 */
-	u32 trans_color0;			/* 0x54 */
-	u32 trans_color1;			/* 0x58 */
-	u32 line_status;			/* 0x5C */
-	u32 line_number;			/* 0x60 */
-	u32 timing_h;				/* 0x64 */
-	u32 timing_v;				/* 0x68 */
-	u32 pol_freq;				/* 0x6C */
-	u32 divisor;				/* 0x70 */
-	u32 global_alpha;			/* 0x74 */
-	u32 size_dig;				/* 0x78 */
-	u32 size_lcd;				/* 0x7C */
-};
-
-/* VENC Registers */
-struct venc_regs {
-	u32 rev_id;				/* 0x00 */
-	u32 status;				/* 0x04 */
-	u32 f_control;				/* 0x08 */
-	u32 reserve_1;				/* 0x0C */
-	u32 vidout_ctrl;			/* 0x10 */
-	u32 sync_ctrl;				/* 0x14 */
-	u32 reserve_2;				/* 0x18 */
-	u32 llen;				/* 0x1C */
-	u32 flens;				/* 0x20 */
-	u32 hfltr_ctrl;				/* 0x24 */
-	u32 cc_carr_wss_carr;			/* 0x28 */
-	u32 c_phase;				/* 0x2C */
-	u32 gain_u;				/* 0x30 */
-	u32 gain_v;				/* 0x34 */
-	u32 gain_y;				/* 0x38 */
-	u32 black_level;			/* 0x3C */
-	u32 blank_level;			/* 0x40 */
-	u32 x_color;				/* 0x44 */
-	u32 m_control;				/* 0x48 */
-	u32 bstamp_wss_data;			/* 0x4C */
-	u32 s_carr;				/* 0x50 */
-	u32 line21;				/* 0x54 */
-	u32 ln_sel;				/* 0x58 */
-	u32 l21__wc_ctl;			/* 0x5C */
-	u32 htrigger_vtrigger;			/* 0x60 */
-	u32 savid__eavid;			/* 0x64 */
-	u32 flen__fal;				/* 0x68 */
-	u32 lal__phase_reset;			/* 0x6C */
-	u32 hs_int_start_stop_x;		/* 0x70 */
-	u32 hs_ext_start_stop_x;		/* 0x74 */
-	u32 vs_int_start_x;			/* 0x78 */
-	u32 vs_int_stop_x__vs_int_start_y;	/* 0x7C */
-	u32 vs_int_stop_y__vs_ext_start_x;	/* 0x80 */
-	u32 vs_ext_stop_x__vs_ext_start_y;	/* 0x84 */
-	u32 vs_ext_stop_y;			/* 0x88 */
-	u32 reserve_3;				/* 0x8C */
-	u32 avid_start_stop_x;			/* 0x90 */
-	u32 avid_start_stop_y;			/* 0x94 */
-	u32 reserve_4;				/* 0x98 */
-	u32 reserve_5;				/* 0x9C */
-	u32 fid_int_start_x__fid_int_start_y;	/* 0xA0 */
-	u32 fid_int_offset_y__fid_ext_start_x;	/* 0xA4 */
-	u32 fid_ext_start_y__fid_ext_offset_y;	/* 0xA8 */
-	u32 reserve_6;				/* 0xAC */
-	u32 tvdetgp_int_start_stop_x;		/* 0xB0 */
-	u32 tvdetgp_int_start_stop_y;		/* 0xB4 */
-	u32 gen_ctrl;				/* 0xB8 */
-	u32 reserve_7;				/* 0xBC */
-	u32 reserve_8;				/* 0xC0 */
-	u32 output_control;			/* 0xC4 */
-	u32 dac_b__dac_c;			/* 0xC8 */
-	u32 height_width;			/* 0xCC */
-};
-
-/* Few Register Offsets */
-#define FRAME_MODE_SHIFT			1
-#define TFTSTN_SHIFT				3
-#define DATALINES_SHIFT				8
-
-/* Enabling Display controller */
-#define LCD_ENABLE				1
-#define DIG_ENABLE				(1 << 1)
-#define GO_LCD					(1 << 5)
-#define GO_DIG					(1 << 6)
-#define GP_OUT0					(1 << 15)
-#define GP_OUT1					(1 << 16)
-
-#define DISPC_ENABLE				(LCD_ENABLE | \
-						 DIG_ENABLE | \
-						 GO_LCD | \
-						 GO_DIG | \
-						 GP_OUT0| \
-						 GP_OUT1)
-
-/* Configure VENC DSS Params */
-#define VENC_CLK_ENABLE				(1 << 3)
-#define DAC_DEMEN				(1 << 4)
-#define DAC_POWERDN				(1 << 5)
-#define VENC_OUT_SEL				(1 << 6)
-#define DIG_LPP_SHIFT				16
-#define VENC_DSS_CONFIG				(VENC_CLK_ENABLE | \
-						 DAC_DEMEN | \
-						 DAC_POWERDN | \
-						 VENC_OUT_SEL)
-/*
- * Panel Configuration
- */
-struct panel_config {
-	u32 timing_h;
-	u32 timing_v;
-	u32 pol_freq;
-	u32 divisor;
-	u32 lcd_size;
-	u32 panel_type;
-	u32 data_lines;
-	u32 load_mode;
-	u32 panel_color;
-};
-
-/*
- * Generic DSS Functions
- */
-void omap3_dss_venc_config(const struct venc_regs *venc_cfg,
-			u32 height, u32 width);
-void omap3_dss_panel_config(const struct panel_config *panel_cfg);
-void omap3_dss_enable(void);
-
-#endif /* DSS_H */
diff --git a/include/compiler.h b/include/compiler.h
index ded6786..91dbe56 100644
--- a/include/compiler.h
+++ b/include/compiler.h
@@ -46,9 +46,6 @@
 # include <byteswap.h>
 #elif defined(__MACH__)
 # include <machine/endian.h>
-#define __LITTLE_ENDIAN LITTLE_ENDIAN
-#define __BIG_ENDIAN BIG_ENDIAN
-#define __BYTE_ORDER BYTE_ORDER
 typedef unsigned long ulong;
 #endif
 
diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
index bbb1073..07c2922 100644
--- a/include/configs/omap3_beagle.h
+++ b/include/configs/omap3_beagle.h
@@ -90,6 +90,8 @@
 #define CONFIG_SYS_NS16550_COM3		OMAP34XX_UART3
 #define CONFIG_SERIAL3			3	/* UART3 on Beagle Rev 2 */
 
+#define CONFIG_SYS_NS16550_COM2		OMAP34XX_UART2
+
 /* allow to overwrite serial and ethaddr */
 #define CONFIG_ENV_OVERWRITE
 #define CONFIG_BAUDRATE			115200
@@ -103,6 +105,12 @@
 /* DDR - I use Micron DDR */
 #define CONFIG_OMAP3_MICRON_DDR		1
 
+/* Enable Multi Bus support for I2C */
+#define CONFIG_I2C_MULTI_BUS		1
+
+/* Probe all devices */
+#define CONFIG_SYS_I2C_NOPROBES		{0x0, 0x0}
+
 /* USB */
 #define CONFIG_MUSB_UDC			1
 #define CONFIG_USB_OMAP3		1
@@ -130,6 +138,9 @@
 #define CONFIG_CMD_I2C		/* I2C serial bus support	*/
 #define CONFIG_CMD_MMC		/* MMC support			*/
 #define CONFIG_CMD_NAND		/* NAND support			*/
+#define CONFIG_CMD_LED		/* LED support			*/
+#define CONFIG_VIDEO_OMAP3	/* DSS Support			*/
+#define CONFIG_CMD_SETEXPR	/* Evaluate expressions		*/
 
 #undef CONFIG_CMD_FLASH		/* flinfo, erase, protect	*/
 #undef CONFIG_CMD_FPGA		/* FPGA configuration Support	*/