From 1f506217992776b7f07983240e497cf6e068fc80 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Fri, 9 Dec 2011 11:52:46 +0100 Subject: [PATCH] u-boot 2011.12rc1: add beagleboard and pandaboard patches Signed-off-by: Koen Kooi --- ...ount-rootfs-RO-instead-of-RW-at-boot.patch | 26 +++++ ...ard-add-support-for-TCT-Beacon-board.patch | 65 +++++++++++ ...support-for-scanning-loop-through-ex.patch | 105 ++++++++++++++++++ .../0004-omap4-common-mount-root-RO.patch | 26 +++++ ...005-omap4-common-use-ext4-by-default.patch | 26 +++++ recipes-bsp/u-boot/u-boot_2011.12.bb | 7 +- 6 files changed, 254 insertions(+), 1 deletion(-) create mode 100644 recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch create mode 100644 recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch b/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch new file mode 100644 index 00000000..07ab75b1 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch @@ -0,0 +1,26 @@ +From d0556964b6bd443e8b60d5c0b3326795a02cc8a7 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 27 Nov 2011 14:43:58 +0100 +Subject: [PATCH 1/5] beagleboard: mount rootfs RO instead of RW at boot + +Signed-off-by: Koen Kooi +--- + include/configs/omap3_beagle.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index 91af8a0..d4f33d0 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -220,7 +220,7 @@ + "dvimode=640x480MR-16@60\0" \ + "defaultdisplay=dvi\0" \ + "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcroot=/dev/mmcblk0p2 ro\0" \ + "mmcrootfstype=ext3 rootwait\0" \ + "nandroot=ubi0:rootfs ubi.mtd=4\0" \ + "nandrootfstype=ubifs\0" \ +-- +1.7.2.5 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch b/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch new file mode 100644 index 00000000..5af34a15 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch @@ -0,0 +1,65 @@ +From 28e5cc1f13d817f75638c72eae853e53510a1ab2 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sat, 8 Oct 2011 21:56:35 +0200 +Subject: [PATCH 2/5] beagleboard: add support for TCT Beacon board + +Signed-off-by: Koen Kooi +--- + board/ti/beagle/beagle.c | 10 ++++++++++ + board/ti/beagle/beagle.h | 7 +++++++ + 2 files changed, 17 insertions(+), 0 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 6a457cb..9c2e6d0 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -59,11 +59,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_TRAINER 0x04000100 + #define TINCANTOOLS_SHOWDOG 0x03000100 ++#define TINCANTOOLS_BEACON 0x05000100 + #define KBADC_BEAGLEFPGA 0x01000600 + #define LW_BEAGLETOUCH 0x01000700 + #define BRAINMUX_LCDOG 0x01000800 +@@ -351,6 +354,13 @@ int misc_init_r(void) + setenv("defaultdisplay", "showdoglcd"); + setenv("buddy", "showdog"); + break; ++ case TINCANTOOLS_BEACON: ++ printf("Recognized Tincantools Beacon board (rev %d %s)\n", ++ expansion_config.revision, ++ expansion_config.fab_revision); ++ MUX_TINCANTOOLS_BEACON(); ++ setenv("buddy", "beacon"); ++ break; + case KBADC_BEAGLEFPGA: + printf("Recognized KBADC Beagle FPGA board\n"); + MUX_KBADC_BEAGLEFPGA(); +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +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.7.2.5 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch b/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch new file mode 100644 index 00000000..c8bb1309 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch @@ -0,0 +1,105 @@ +From 4422038e69f79993cc21e3649715c9556e68413d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Sun, 27 Nov 2011 14:53:56 +0100 +Subject: [PATCH 3/5] beagleboard: add support for scanning loop-through expansionboards like the uLCD-lite + +Signed-off-by: Koen Kooi +--- + board/ti/beagle/beagle.c | 30 ++++++++++++++++++++++++++---- + include/configs/omap3_beagle.h | 2 ++ + 2 files changed, 28 insertions(+), 4 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 9c2e6d0..5ea50d1 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -74,6 +74,7 @@ extern volatile struct ehci_hcor *hcor; + #define BBTOYS_WIFI 0x01000B00 + #define BBTOYS_VGA 0x02000B00 + #define BBTOYS_LCD 0x03000B00 ++#define BBTOYS_ULCD 0x04000B00 + #define BEAGLE_NO_EEPROM 0xffffffff + + DECLARE_GLOBAL_DATA_PTR; +@@ -209,18 +210,18 @@ void get_board_mem_timings(u32 *mcfg, u32 *ctrla, u32 *ctrlb, u32 *rfr_ctrl, + * bus 1 for the availability of an AT24C01B serial EEPROM. + * returns the device_vendor field from the EEPROM + */ +-unsigned int get_expansion_id(void) ++unsigned int get_expansion_id(int eeprom_address) + { + i2c_set_bus_num(EXPANSION_EEPROM_I2C_BUS); + + /* return BEAGLE_NO_EEPROM if eeprom doesn't respond */ +- if (i2c_probe(EXPANSION_EEPROM_I2C_ADDRESS) == 1) { ++ if (i2c_probe(eeprom_address) == 1) { + i2c_set_bus_num(TWL4030_I2C_BUS); + return BEAGLE_NO_EEPROM; + } + + /* read configuration data */ +- i2c_read(EXPANSION_EEPROM_I2C_ADDRESS, 0, 1, (u8 *)&expansion_config, ++ i2c_read(eeprom_address, 0, 1, (u8 *)&expansion_config, + sizeof(expansion_config)); + + i2c_set_bus_num(TWL4030_I2C_BUS); +@@ -323,7 +324,7 @@ int misc_init_r(void) + TWL4030_PM_RECEIVER_DEV_GRP_P1); + } + +- switch (get_expansion_id()) { ++ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS)) { + case TINCANTOOLS_ZIPPY: + printf("Recognized Tincantools Zippy board (rev %d %s)\n", + expansion_config.revision, +@@ -402,6 +403,27 @@ int misc_init_r(void) + if (expansion_config.content == 1) + setenv(expansion_config.env_var, expansion_config.env_setting); + ++ /* Scan 0x51 as well for loop-thru boards */ ++ switch (get_expansion_id(EXPANSION_EEPROM_I2C_ADDRESS + 1)) { ++ case BBTOYS_ULCD: ++ printf("Recognized BeagleBoardToys uLCD-lite board\n"); ++ setenv("buddy2", "bbtoys-ulcd"); ++ setenv("defaultdisplay", "lcd"); ++ setenv("uenvcmd", "i2c dev 1 ; i2c mw 40 00 00; i2c mw 40 04 80; i2c mw 40 0d 05; i2c mw 40 0d 15"); ++ break; ++ case BEAGLE_NO_EEPROM: ++ printf("No EEPROM on expansion board\n"); ++ setenv("buddy2", "none"); ++ break; ++ default: ++ printf("Unrecognized expansion board: %x\n", ++ expansion_config.device_vendor); ++ setenv("buddy2", "unknown"); ++ } ++ ++ if (expansion_config.content == 1) ++ setenv(expansion_config.env_var, expansion_config.env_setting); ++ + twl4030_power_init(); + switch (get_board_revision()) { + case REVISION_XM_A: +diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h +index d4f33d0..04d3eed 100644 +--- a/include/configs/omap3_beagle.h ++++ b/include/configs/omap3_beagle.h +@@ -214,6 +214,7 @@ + "console=ttyO2,115200n8\0" \ + "mpurate=auto\0" \ + "buddy=none "\ ++ "buddy2=none "\ + "optargs=\0" \ + "camera=none\0" \ + "vram=12M\0" \ +@@ -240,6 +241,7 @@ + "${optargs} " \ + "mpurate=${mpurate} " \ + "buddy=${buddy} "\ ++ "buddy2=${buddy2} "\ + "camera=${camera} "\ + "vram=${vram} " \ + "omapfb.mode=dvi:${dvimode} " \ +-- +1.7.2.5 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch b/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch new file mode 100644 index 00000000..0d3655d3 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0004-omap4-common-mount-root-RO.patch @@ -0,0 +1,26 @@ +From 90dfb660575f15ba736884139f35bfd4ba927468 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 8 Dec 2011 17:22:59 +0100 +Subject: [PATCH 4/5] omap4-common: mount root RO + +Signed-off-by: Koen Kooi +--- + include/configs/omap4_common.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h +index a989721..54760e9 100644 +--- a/include/configs/omap4_common.h ++++ b/include/configs/omap4_common.h +@@ -154,7 +154,7 @@ + "usbtty=cdc_acm\0" \ + "vram=16M\0" \ + "mmcdev=0\0" \ +- "mmcroot=/dev/mmcblk0p2 rw\0" \ ++ "mmcroot=/dev/mmcblk0p2 ro\0" \ + "mmcrootfstype=ext3 rootwait\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ +-- +1.7.2.5 + diff --git a/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch b/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch new file mode 100644 index 00000000..e28eae57 --- /dev/null +++ b/recipes-bsp/u-boot/u-boot/2011.12/0005-omap4-common-use-ext4-by-default.patch @@ -0,0 +1,26 @@ +From a1f9453f2450762249aa35bd5ae97150acc53eb2 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Thu, 8 Dec 2011 17:23:24 +0100 +Subject: [PATCH 5/5] omap4-common: use ext4 by default + +Signed-off-by: Koen Kooi +--- + include/configs/omap4_common.h | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/include/configs/omap4_common.h b/include/configs/omap4_common.h +index 54760e9..7637688 100644 +--- a/include/configs/omap4_common.h ++++ b/include/configs/omap4_common.h +@@ -155,7 +155,7 @@ + "vram=16M\0" \ + "mmcdev=0\0" \ + "mmcroot=/dev/mmcblk0p2 ro\0" \ +- "mmcrootfstype=ext3 rootwait\0" \ ++ "mmcrootfstype=ext4 rootwait\0" \ + "mmcargs=setenv bootargs console=${console} " \ + "vram=${vram} " \ + "root=${mmcroot} " \ +-- +1.7.2.5 + diff --git a/recipes-bsp/u-boot/u-boot_2011.12.bb b/recipes-bsp/u-boot/u-boot_2011.12.bb index 50a178d2..b735702d 100644 --- a/recipes-bsp/u-boot/u-boot_2011.12.bb +++ b/recipes-bsp/u-boot/u-boot_2011.12.bb @@ -6,12 +6,17 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img" UBOOT_SYMLINK = "u-boot-${MACHINE}.img" PV = "2011.09+2011.12rc1" +PR = "r1" # No patches for other machines yet COMPATIBLE_MACHINE = "(beagleboard|pandaboard|hawkboard|am3517-evm|am37x-evm|omap3evm)" SRC_URI = "git://www.denx.de/git/u-boot.git;protocol=git \ - file://fw_env.config \ + file://2011.12/0001-beagleboard-mount-rootfs-RO-instead-of-RW-at-boot.patch \ + file://2011.12/0002-beagleboard-add-support-for-TCT-Beacon-board.patch \ + file://2011.12/0003-beagleboard-add-support-for-scanning-loop-through-ex.patch \ + file://2011.12/0004-omap4-common-mount-root-RO.patch \ + file://2011.12/0005-omap4-common-use-ext4-by-default.patch \ " SRCREV = "d82a27bc5c404da907f71960a3ed2e148ac73fd0"