From a6349cc0bd9ea07274bb7a02dd44b2172ca2306a Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 27 Apr 2010 18:48:00 +0200 Subject: [PATCH] u-boot git: update beagleboard patchset to match http://gitorious.org/beagleboard-validation/u-boot/commits/xm --- ...-display-message-about-I2C-errors-being-e.patch | 4 +- ...02-beagleboard-fix-TCT-expansionboard-IDs.patch | 4 +- .../0003-Add-DSS-driver-for-OMAP3.patch | 4 +- .../0004-Enable-DSS-driver-for-Beagle.patch | 4 +- ...ardXM-don-t-set-mpurate-on-xM-in-bootargs.patch | 4 +- ...nd-clean-up-L2-cache-enable-disable-funct.patch | 112 +++++++++++++++++++++ ...e-ES1-cache-workaround-it-falsely-trigger.patch | 32 ------ ...007-OMAP3-convert-setup_auxcr-to-pure-asm.patch | 99 ++++++++++++++++++ ...-Cortex-A8-errata-workarounds-only-on-aff.patch | 46 +++++++++ ...e-add-more-expansionboards-based-on-http-.patch | 61 +++++++++++ ...e-set-mpurate-to-600-for-revB-and-revC1-3.patch | 29 ++++++ ...gle-prettify-expansionboard-message-a-bit.patch | 25 +++++ ...e-add-pinmux-for-Tincantools-Trainer-expa.patch | 53 ++++++++++ recipes/u-boot/u-boot_git.bb | 10 +- 14 files changed, 443 insertions(+), 44 deletions(-) create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch delete mode 100644 recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch create mode 100644 recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch diff --git a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch index 18eeb3d6fc..10e3412bcd 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0001-beagleboard-display-message-about-I2C-errors-being-e.patch @@ -1,7 +1,7 @@ -From 59d34641c947f3b0a0c3757ced675245ae344012 Mon Sep 17 00:00:00 2001 +From f62aac5842779fbc5a62ade1c78d47244d565456 Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Wed, 31 Mar 2010 14:24:25 +0200 -Subject: [PATCH 1/6] beagleboard: display message about I2C errors being expected when no expansion boards are present +Subject: [PATCH 01/12] beagleboard: display message about I2C errors being expected when no expansion boards are present --- board/ti/beagle/beagle.c | 3 +++ diff --git a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch b/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch index 0d75f3cffc..6638532f7e 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0002-beagleboard-fix-TCT-expansionboard-IDs.patch @@ -1,7 +1,7 @@ -From 4397cc2f9b55471b4d90e7327bf65e1a610dcabb Mon Sep 17 00:00:00 2001 +From d195df3a41a9614e150f517a25bf7b7f684bf05d Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Sun, 11 Apr 2010 12:14:43 +0200 -Subject: [PATCH 2/6] beagleboard: fix TCT expansionboard IDs +Subject: [PATCH 02/12] beagleboard: fix TCT expansionboard IDs --- board/ti/beagle/beagle.c | 4 ++-- diff --git a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch b/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch index 0a2a47f224..024ebaab1f 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0003-Add-DSS-driver-for-OMAP3.patch @@ -1,7 +1,7 @@ -From fe23f2e29f4d6f4f20ed268d8060f897392a47f7 Mon Sep 17 00:00:00 2001 +From 53c3410ac7acae89c349cd1aa9b51fd81807dfd7 Mon Sep 17 00:00:00 2001 From: Syed Mohammed Khasim Date: Tue, 12 Jan 2010 23:57:28 +0530 -Subject: [PATCH 3/6] Add DSS driver for OMAP3 +Subject: [PATCH 03/12] Add DSS driver for OMAP3 Supports dynamic panel configuration Supports dynamic tv standard selection diff --git a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch b/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch index a391dbd9d8..fcb10e9a12 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0004-Enable-DSS-driver-for-Beagle.patch @@ -1,7 +1,7 @@ -From 492fac657a2e53f4714e24471a01ed0462edb8fc Mon Sep 17 00:00:00 2001 +From 907184b7135a2f954b905fdae8d1d6fff0d35744 Mon Sep 17 00:00:00 2001 From: Syed Mohammed Khasim Date: Sun, 11 Apr 2010 17:44:39 +0200 -Subject: [PATCH 4/6] Enable DSS driver for Beagle +Subject: [PATCH 04/12] Enable DSS driver for Beagle Configures DSS to display color bar on Svideo Configures DSS to display background color on DVID diff --git a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch b/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch index 020bbe15a1..1f76c9e5b2 100644 --- a/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch +++ b/recipes/u-boot/u-boot-git/beagleboard/0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch @@ -1,7 +1,7 @@ -From 2a567cdc062d65e175f7bf0324d5d41d803fb2c5 Mon Sep 17 00:00:00 2001 +From 5a19707fed74b11a448c8467806b1cc038b449bc Mon Sep 17 00:00:00 2001 From: Koen Kooi Date: Tue, 13 Apr 2010 22:04:07 +0200 -Subject: [PATCH 5/6] beagleboardXM: don't set mpurate on xM in bootargs +Subject: [PATCH 05/12] beagleboardXM: don't set mpurate on xM in bootargs --- board/ti/beagle/beagle.c | 1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch new file mode 100644 index 0000000000..b1d1f40885 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch @@ -0,0 +1,112 @@ +From 02ed9b6e7ddb60e440de346d56e77b9462f92d52 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard +Date: Wed, 14 Apr 2010 12:08:00 +0100 +Subject: [PATCH 06/12] OMAP3: fix and clean up L2 cache enable/disable functions + +On OMAP34xx ES1.0, the L2 enable bit can only be set in secure mode, +so an SMC call to the ROM monitor is required. On later versions, +and on newer devices, this bit is banked and we can set it directly. + +The code checked only the ES revision of the chip, and hence incorrectly +used the ROM call on ES1.0 versions of other devices. + +This patch adds a check for chip family as well as revision, and also +removes some code duplication between the enable and disable functions. + +Signed-off-by: Mans Rullgard +--- + cpu/arm_cortexa8/omap3/cache.S | 74 +++++++++++----------------------------- + 1 files changed, 20 insertions(+), 54 deletions(-) + +diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S +index 0f63815..16afb5d 100644 +--- a/cpu/arm_cortexa8/omap3/cache.S ++++ b/cpu/arm_cortexa8/omap3/cache.S +@@ -128,64 +128,30 @@ finished_inval: + + ldmfd r13!, {r0 - r5, r7, r9 - r12, pc} + +- +-l2_cache_enable: +- push {r0, r1, r2, lr} +- @ ES2 onwards we can disable/enable L2 ourselves ++l2_cache_set: ++ push {r4-r6, lr} ++ mov r5, r0 + bl get_cpu_rev +- cmp r0, #CPU_3XX_ES20 +- blt l2_cache_disable_EARLIER_THAN_ES2 +- mrc 15, 0, r3, cr1, cr0, 1 +- orr r3, r3, #2 +- mcr 15, 0, r3, cr1, cr0, 1 +- b l2_cache_enable_END +-l2_cache_enable_EARLIER_THAN_ES2: +- @ Save r0, r12 and restore them after usage +- mov r3, ip +- str r3, [sp, #4] +- mov r3, r0 +- @ ++ mov r4, r0 ++ bl get_cpu_family ++ @ ES2 onwards we can disable/enable L2 ourselves ++ cmp r0, #CPU_OMAP34XX ++ cmpeq r4, #CPU_3XX_ES10 ++ mrc 15, 0, r0, cr1, cr0, 1 ++ bic r0, r0, #2 ++ orr r0, r0, r5, lsl #1 ++ mcreq 15, 0, r0, cr1, cr0, 1 + @ GP Device ROM code API usage here + @ r12 = AUXCR Write function and r0 value +- @ + mov ip, #3 +- mrc 15, 0, r0, cr1, cr0, 1 +- orr r0, r0, #2 +- @ SMI instruction to call ROM Code API +- .word 0xe1600070 +- mov r0, r3 +- mov ip, r3 +- str r3, [sp, #4] +-l2_cache_enable_END: +- pop {r1, r2, r3, pc} ++ @ SMCNE instruction to call ROM Code API ++ .word 0x11600070 ++ pop {r4-r6, pc} + ++l2_cache_enable: ++ mov r0, #1 ++ b l2_cache_set + + l2_cache_disable: +- push {r0, r1, r2, lr} +- @ ES2 onwards we can disable/enable L2 ourselves +- bl get_cpu_rev +- cmp r0, #CPU_3XX_ES20 +- blt l2_cache_disable_EARLIER_THAN_ES2 +- mrc 15, 0, r3, cr1, cr0, 1 +- bic r3, r3, #2 +- mcr 15, 0, r3, cr1, cr0, 1 +- b l2_cache_disable_END +-l2_cache_disable_EARLIER_THAN_ES2: +- @ Save r0, r12 and restore them after usage +- mov r3, ip +- str r3, [sp, #4] +- mov r3, r0 +- @ +- @ GP Device ROM code API usage here +- @ r12 = AUXCR Write function and r0 value +- @ +- mov ip, #3 +- mrc 15, 0, r0, cr1, cr0, 1 +- bic r0, r0, #2 +- @ SMI instruction to call ROM Code API +- .word 0xe1600070 +- mov r0, r3 +- mov ip, r3 +- str r3, [sp, #4] +-l2_cache_disable_END: +- pop {r1, r2, r3, pc} ++ mov r0, #0 ++ b l2_cache_set +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch b/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch deleted file mode 100644 index b1c228f66d..0000000000 --- a/recipes/u-boot/u-boot-git/beagleboard/0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch +++ /dev/null @@ -1,32 +0,0 @@ -From afcb8e0076e2b1e8c78d7c8c34c29ec2447dc02a Mon Sep 17 00:00:00 2001 -From: Koen Kooi -Date: Wed, 14 Apr 2010 12:23:31 +0200 -Subject: [PATCH 6/6] OMAP3: remove ES1 cache workaround, it falsely triggers on xM37xx ES1 silicon - ---- - cpu/arm_cortexa8/omap3/cache.S | 2 -- - 1 files changed, 0 insertions(+), 2 deletions(-) - -diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S -index 0f63815..a2d1b09 100644 ---- a/cpu/arm_cortexa8/omap3/cache.S -+++ b/cpu/arm_cortexa8/omap3/cache.S -@@ -134,7 +134,6 @@ l2_cache_enable: - @ ES2 onwards we can disable/enable L2 ourselves - bl get_cpu_rev - cmp r0, #CPU_3XX_ES20 -- blt l2_cache_disable_EARLIER_THAN_ES2 - mrc 15, 0, r3, cr1, cr0, 1 - orr r3, r3, #2 - mcr 15, 0, r3, cr1, cr0, 1 -@@ -165,7 +164,6 @@ l2_cache_disable: - @ ES2 onwards we can disable/enable L2 ourselves - bl get_cpu_rev - cmp r0, #CPU_3XX_ES20 -- blt l2_cache_disable_EARLIER_THAN_ES2 - mrc 15, 0, r3, cr1, cr0, 1 - bic r3, r3, #2 - mcr 15, 0, r3, cr1, cr0, 1 --- -1.6.6.1 - diff --git a/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch new file mode 100644 index 0000000000..5942c2e3b1 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch @@ -0,0 +1,99 @@ +From 30ae6d713660fb415e6f253ec30cc0b2e5ffc2ee Mon Sep 17 00:00:00 2001 +From: Mans Rullgard +Date: Wed, 14 Apr 2010 16:49:57 +0100 +Subject: [PATCH 07/12] OMAP3: convert setup_auxcr() to pure asm + +This function consists entirely of inline asm statements, so writing +it directly in a .S file is simpler. Additionally, the inline asm is +not safe as is, since registers are not guaranteed to be preserved +between asm() statements. + +Signed-off-by: Mans Rullgard +--- + cpu/arm_cortexa8/omap3/board.c | 35 ----------------------------------- + cpu/arm_cortexa8/omap3/cache.S | 19 +++++++++++++++++++ + 2 files changed, 19 insertions(+), 35 deletions(-) + +diff --git a/cpu/arm_cortexa8/omap3/board.c b/cpu/arm_cortexa8/omap3/board.c +index 0126152..7f49199 100644 +--- a/cpu/arm_cortexa8/omap3/board.c ++++ b/cpu/arm_cortexa8/omap3/board.c +@@ -122,41 +122,6 @@ void secureworld_exit() + } + + /****************************************************************************** +- * Routine: setup_auxcr() +- * Description: Write to AuxCR desired value using SMI. +- * general use. +- *****************************************************************************/ +-void setup_auxcr() +-{ +- unsigned long i; +- volatile unsigned int j; +- /* Save r0, r12 and restore them after usage */ +- __asm__ __volatile__("mov %0, r12":"=r"(j)); +- __asm__ __volatile__("mov %0, r0":"=r"(i)); +- +- /* +- * GP Device ROM code API usage here +- * r12 = AUXCR Write function and r0 value +- */ +- __asm__ __volatile__("mov r12, #0x3"); +- __asm__ __volatile__("mrc p15, 0, r0, c1, c0, 1"); +- /* Enabling ASA */ +- __asm__ __volatile__("orr r0, r0, #0x10"); +- /* Enable L1NEON */ +- __asm__ __volatile__("orr r0, r0, #1 << 5"); +- /* SMI instruction to call ROM Code API */ +- __asm__ __volatile__(".word 0xE1600070"); +- /* Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) */ +- __asm__ __volatile__("mov r12, #0x2"); +- __asm__ __volatile__("mrc p15, 1, r0, c9, c0, 2"); +- __asm__ __volatile__("orr r0, r0, #1 << 27"); +- /* SMI instruction to call ROM Code API */ +- __asm__ __volatile__(".word 0xE1600070"); +- __asm__ __volatile__("mov r0, %0":"=r"(i)); +- __asm__ __volatile__("mov r12, %0":"=r"(j)); +-} +- +-/****************************************************************************** + * Routine: try_unlock_sram() + * Description: If chip is GP/EMU(special) type, unlock the SRAM for + * general use. +diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S +index 16afb5d..61e6946 100644 +--- a/cpu/arm_cortexa8/omap3/cache.S ++++ b/cpu/arm_cortexa8/omap3/cache.S +@@ -43,6 +43,7 @@ + .global invalidate_dcache + .global l2_cache_enable + .global l2_cache_disable ++.global setup_auxcr + + /* + * invalidate_dcache() +@@ -155,3 +156,21 @@ l2_cache_enable: + l2_cache_disable: + mov r0, #0 + b l2_cache_set ++ ++/****************************************************************************** ++ * Routine: setup_auxcr() ++ * Description: Write to AuxCR desired value using SMI. ++ * general use. ++ *****************************************************************************/ ++setup_auxcr: ++ mov r12, #0x3 ++ mrc p15, 0, r0, c1, c0, 1 ++ orr r0, r0, #0x10 @ Enable ASA ++ orr r0, r0, #1 << 5 @ Enable L1NEON ++ .word 0xE1600070 @ SMC ++ mov r12, #0x2 ++ mrc p15, 1, r0, c9, c0, 2 ++ @ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) ++ orr r0, r0, #1 << 27 ++ .word 0xE1600070 @ SMC ++ bx lr +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch new file mode 100644 index 0000000000..5c3e02f0f8 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch @@ -0,0 +1,46 @@ +From 2d0c47945ca49aa18dbedd9e4266ec18bc3b0150 Mon Sep 17 00:00:00 2001 +From: Mans Rullgard +Date: Wed, 14 Apr 2010 17:10:28 +0100 +Subject: [PATCH 08/12] OMAP3: apply Cortex-A8 errata workarounds only on affected revisions + +The workarounds for errata 621766 and 725233 should only be applied +on affected Cortex-A8 revisions. Recent chips use r3px cores where +these have been fixed. + +Signed-off-by: Mans Rullgard +--- + cpu/arm_cortexa8/omap3/cache.S | 13 ++++++++++--- + 1 files changed, 10 insertions(+), 3 deletions(-) + +diff --git a/cpu/arm_cortexa8/omap3/cache.S b/cpu/arm_cortexa8/omap3/cache.S +index 61e6946..932e4eb 100644 +--- a/cpu/arm_cortexa8/omap3/cache.S ++++ b/cpu/arm_cortexa8/omap3/cache.S +@@ -163,14 +163,21 @@ l2_cache_disable: + * general use. + *****************************************************************************/ + setup_auxcr: ++ mrc p15, 0, r0, c0, c0, 0 @ read main ID register ++ and r2, r0, #0x00f00000 @ variant ++ and r3, r0, #0x0000000f @ revision ++ orr r1, r3, r2, lsr #20-4 @ combine variant and revision + mov r12, #0x3 + mrc p15, 0, r0, c1, c0, 1 + orr r0, r0, #0x10 @ Enable ASA +- orr r0, r0, #1 << 5 @ Enable L1NEON ++ @ Enable L1NEON on pre-r2p1 (erratum 621766 workaround) ++ cmp r1, #0x21 ++ orrlt r0, r0, #1 << 5 + .word 0xE1600070 @ SMC + mov r12, #0x2 + mrc p15, 1, r0, c9, c0, 2 +- @ Set PLD_FWD bit in L2AUXCR (Cortex-A8 erratum 725233 workaround) +- orr r0, r0, #1 << 27 ++ @ Set PLD_FWD bit in L2AUXCR on pre-r2p1 (erratum 725233 workaround) ++ cmp r1, #0x21 ++ orrlt r0, r0, #1 << 27 + .word 0xE1600070 @ SMC + bx lr +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch new file mode 100644 index 0000000000..53020a00ab --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch @@ -0,0 +1,61 @@ +From c5e5d27f80e389ddb8c7107e972b94c8d995dc84 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Fri, 23 Apr 2010 10:50:43 +0200 +Subject: [PATCH 09/12] OMAP3: beagle: add more expansionboards, based on http://www.elinux.org/BeagleBoardPinMux#Vendor_and_Device_IDs + +--- + board/ti/beagle/beagle.c | 8 ++++++++ + board/ti/beagle/beagle.h | 6 ++++++ + 2 files changed, 14 insertions(+), 0 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 974a72c..0544178 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -55,11 +55,15 @@ static struct { + #define TINCANTOOLS_VENDORID 0x0100 + #define GUMSTIX_VENDORID 0x0200 + #define SPECIALCOMP_VENDORID 0x0300 ++#define HYR_VENDORID 0x0400 ++#define MENTOREL_VENDORID 0x0500 ++#define KBADC_VENDORID 0x0600 + + #define TINCANTOOLS_ZIPPY 0x01000100 + #define TINCANTOOLS_ZIPPY2 0x02000100 + #define TINCANTOOLS_TRAINER 0x04000100 + #define TINCANTOOLS_SHOWDOG 0x03000100 ++#define KBADC_BEAGLEFPGA 0x01000600 + + #define BEAGLE_NO_EEPROM 0xffffffff + +@@ -184,6 +188,10 @@ int misc_init_r(void) + /* Place holder for DSS2 definition for showdog lcd */ + setenv("defaultdisplay", "showdoglcd"); + break; ++ case KBADC_BEAGLEFPGA: ++ printf("Recognized KBADC Beagle FPGA board\n"); ++ MUX_KBADC_BEAGLEFPGA(); ++ break; + case BEAGLE_NO_EEPROM: + printf("No EEPROM on expansion board\n"); + break; +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index 69f9398..90a0ebf 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -435,6 +435,12 @@ const omap3_sysinfo sysinfo = { + MUX_VAL(CP(MCBSP3_DR), (IEN | PTD | DIS | M4)) /*GPIO_142*/\ + MUX_VAL(CP(MCBSP3_CLKX), (IEN | PTD | DIS | 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 + */ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch new file mode 100644 index 0000000000..8b55544e5c --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch @@ -0,0 +1,29 @@ +From 3c116f300402f6375b7a8987b17962e125372d9d Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 27 Apr 2010 13:44:16 +0200 +Subject: [PATCH 10/12] OMAP3: beagle: set mpurate to 600 for revB and revC1-3 + +--- + board/ti/beagle/beagle.c | 2 ++ + 1 files changed, 2 insertions(+), 0 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 0544178..6778499 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -211,10 +211,12 @@ int misc_init_r(void) + switch (beagle_revision) { + case REVISION_AXBX: + printf("Beagle Rev Ax/Bx\n"); ++ setenv("mpurate", "600"); + break; + case REVISION_CX: + printf("Beagle Rev C1/C2/C3\n"); + MUX_BEAGLE_C(); ++ setenv("mpurate", "600"); + break; + case REVISION_C4: + printf("Beagle Rev C4\n"); +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch new file mode 100644 index 0000000000..9c412fc41c --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch @@ -0,0 +1,25 @@ +From cd82c1f2db57407bc6571a3221937c14924cc440 Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 27 Apr 2010 13:45:28 +0200 +Subject: [PATCH 11/12] OMAP3: beagle: prettify expansionboard message a bit + +--- + board/ti/beagle/beagle.c | 2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 6778499..58fb7c3 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -165,7 +165,7 @@ int misc_init_r(void) + + beagle_identify(); + +- printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n"); ++ printf("\nProbing for expansion boards, if none are connected you'll see a harmless I2C error.\n\n"); + + switch (get_expansion_id()) { + case TINCANTOOLS_ZIPPY: +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch new file mode 100644 index 0000000000..b33af9d0a4 --- /dev/null +++ b/recipes/u-boot/u-boot-git/beagleboard/0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch @@ -0,0 +1,53 @@ +From f5796d9de9622ef47fff175613f1baf1d372b5ff Mon Sep 17 00:00:00 2001 +From: Koen Kooi +Date: Tue, 27 Apr 2010 18:25:57 +0200 +Subject: [PATCH 12/12] OMAP3: beagle: add pinmux for Tincantools Trainer expansionboard + +--- + board/ti/beagle/beagle.c | 2 ++ + board/ti/beagle/beagle.h | 16 +++++++++++++++- + 2 files changed, 17 insertions(+), 1 deletions(-) + +diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c +index 58fb7c3..39c53f2 100644 +--- a/board/ti/beagle/beagle.c ++++ b/board/ti/beagle/beagle.c +@@ -181,6 +181,8 @@ int misc_init_r(void) + case TINCANTOOLS_TRAINER: + printf("Recognized Tincantools Trainer expansion board (rev %d %s)\n", + expansion_config.revision, expansion_config.fab_revision); ++ MUX_TINCANTOOLS_ZIPPY(); ++ MUX_TINCANTOOLS_TRAINER(); + break; + case TINCANTOOLS_SHOWDOG: + printf("Recognized Tincantools Showdow expansion board (rev %d %s)\n", +diff --git a/board/ti/beagle/beagle.h b/board/ti/beagle/beagle.h +index 90a0ebf..7774855 100644 +--- a/board/ti/beagle/beagle.h ++++ b/board/ti/beagle/beagle.h +@@ -433,7 +433,21 @@ const omap3_sysinfo sysinfo = { + 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*/\ ++ 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*/\ +-- +1.6.6.1 + diff --git a/recipes/u-boot/u-boot_git.bb b/recipes/u-boot/u-boot_git.bb index 5cc077358b..5004ffc507 100644 --- a/recipes/u-boot/u-boot_git.bb +++ b/recipes/u-boot/u-boot_git.bb @@ -1,5 +1,5 @@ require u-boot.inc -PR ="r46" +PR ="r47" FILESPATHPKG =. "u-boot-git:" @@ -24,7 +24,13 @@ SRC_URI_beagleboard = "git://www.sakoman.com/git/u-boot.git;branch=omap3-v2010.3 file://0003-Add-DSS-driver-for-OMAP3.patch;patch=1 \ file://0004-Enable-DSS-driver-for-Beagle.patch;patch=1 \ file://0005-beagleboardXM-don-t-set-mpurate-on-xM-in-bootargs.patch;patch=1 \ - file://0006-OMAP3-remove-ES1-cache-workaround-it-falsely-trigger.patch;patch=1 \ + file://0006-OMAP3-fix-and-clean-up-L2-cache-enable-disable-funct.patch;patch=1 \ + file://0007-OMAP3-convert-setup_auxcr-to-pure-asm.patch;patch=1 \ + file://0008-OMAP3-apply-Cortex-A8-errata-workarounds-only-on-aff.patch;patch=1 \ + file://0009-OMAP3-beagle-add-more-expansionboards-based-on-http-.patch;patch=1 \ + file://0010-OMAP3-beagle-set-mpurate-to-600-for-revB-and-revC1-3.patch;patch=1 \ + file://0011-OMAP3-beagle-prettify-expansionboard-message-a-bit.patch;patch=1 \ + file://0012-OMAP3-beagle-add-pinmux-for-Tincantools-Trainer-expa.patch;patch=1 \ file://fw_env.config \ " SRCREV_beagleboard = "946351081bd14e8bf5816fc38b82e004a0e6b4fe" -- 2.11.4.GIT