summaryrefslogtreecommitdiffstats
path: root/recipes-bsp
diff options
context:
space:
mode:
authorKoen Kooi <koen@dominion.thruhere.net>2011-01-28 21:01:29 +0100
committerKoen Kooi <koen@dominion.thruhere.net>2011-01-28 21:04:17 +0100
commitaea4bedfe7a246e90cd1e2fd98f192d0890b444e (patch)
tree0ead33900cf61c781a20d1ce635cba30ae2f7139 /recipes-bsp
parent682d21fe453e2bdd85022dfcd39c3bb423542870 (diff)
downloadmeta-ti-aea4bedfe7a246e90cd1e2fd98f192d0890b444e.tar.gz
x-load: sync with OE
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
Diffstat (limited to 'recipes-bsp')
-rw-r--r--recipes-bsp/x-load/x-load/0001-OMAP4-clocks-Enable-only-required-clks.patch4
-rw-r--r--recipes-bsp/x-load/x-load/0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch4
-rw-r--r--recipes-bsp/x-load/x-load/0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch4
-rw-r--r--recipes-bsp/x-load/x-load/0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch4
-rw-r--r--recipes-bsp/x-load/x-load/0005-omap4-Make-1GHz-as-default-MPU-clock.patch13
-rw-r--r--recipes-bsp/x-load/x-load_git.bb4
6 files changed, 17 insertions, 16 deletions
diff --git a/recipes-bsp/x-load/x-load/0001-OMAP4-clocks-Enable-only-required-clks.patch b/recipes-bsp/x-load/x-load/0001-OMAP4-clocks-Enable-only-required-clks.patch
index 774f1e78..6cec4ef8 100644
--- a/recipes-bsp/x-load/x-load/0001-OMAP4-clocks-Enable-only-required-clks.patch
+++ b/recipes-bsp/x-load/x-load/0001-OMAP4-clocks-Enable-only-required-clks.patch
@@ -1,4 +1,4 @@
1From 94fee465a6d63b6f0551037fe14cec4410bb9af2 Mon Sep 17 00:00:00 2001 1From 7c5a2dd1e20702d220bd75910f7cfb6141230e5b Mon Sep 17 00:00:00 2001
2From: Rajendra Nayak <rnayak@ti.com> 2From: Rajendra Nayak <rnayak@ti.com>
3Date: Tue, 21 Dec 2010 11:55:01 -0200 3Date: Tue, 21 Dec 2010 11:55:01 -0200
4Subject: [PATCH 1/5] OMAP4: clocks: Enable only required clks 4Subject: [PATCH 1/5] OMAP4: clocks: Enable only required clks
@@ -17,7 +17,7 @@ Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
17 1 files changed, 117 insertions(+), 108 deletions(-) 17 1 files changed, 117 insertions(+), 108 deletions(-)
18 18
19diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c 19diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c
20index 792e5d6..149fc85 100644 20index a83f1c6..b323885 100644
21--- a/board/omap4430panda/clock.c 21--- a/board/omap4430panda/clock.c
22+++ b/board/omap4430panda/clock.c 22+++ b/board/omap4430panda/clock.c
23@@ -552,71 +552,73 @@ static void enable_all_clocks(void) 23@@ -552,71 +552,73 @@ static void enable_all_clocks(void)
diff --git a/recipes-bsp/x-load/x-load/0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch b/recipes-bsp/x-load/x-load/0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch
index ffcf8591..8e62d2fd 100644
--- a/recipes-bsp/x-load/x-load/0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch
+++ b/recipes-bsp/x-load/x-load/0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch
@@ -1,4 +1,4 @@
1From fff093ab92c5dadd646130c38097dc167d2d0e1e Mon Sep 17 00:00:00 2001 1From 17028354b438883e98668803bf433d8a0bae12a1 Mon Sep 17 00:00:00 2001
2From: Rajeev Kulkarni <rajeevk@ti.com> 2From: Rajeev Kulkarni <rajeevk@ti.com>
3Date: Tue, 26 Oct 2010 07:34:43 -0500 3Date: Tue, 26 Oct 2010 07:34:43 -0500
4Subject: [PATCH 2/5] OMAP4: Select DPLL PER Clock as source for SGX FCLK 4Subject: [PATCH 2/5] OMAP4: Select DPLL PER Clock as source for SGX FCLK
@@ -14,7 +14,7 @@ Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
14 1 files changed, 3 insertions(+), 0 deletions(-) 14 1 files changed, 3 insertions(+), 0 deletions(-)
15 15
16diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c 16diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c
17index 149fc85..0961f51 100644 17index b323885..4404cc5 100644
18--- a/board/omap4430panda/clock.c 18--- a/board/omap4430panda/clock.c
19+++ b/board/omap4430panda/clock.c 19+++ b/board/omap4430panda/clock.c
20@@ -772,6 +772,9 @@ static void enable_all_clocks(void) 20@@ -772,6 +772,9 @@ static void enable_all_clocks(void)
diff --git a/recipes-bsp/x-load/x-load/0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch b/recipes-bsp/x-load/x-load/0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch
index 1475308f..7f9b7672 100644
--- a/recipes-bsp/x-load/x-load/0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch
+++ b/recipes-bsp/x-load/x-load/0003-MUX-Configure-SYS_NIRQ2-pin-in-safe-mode.patch
@@ -1,4 +1,4 @@
1From daaaf036f3336e01a83a13dd93b8030b00a0af50 Mon Sep 17 00:00:00 2001 1From 3421142b95238893a90032c3056123544c353752 Mon Sep 17 00:00:00 2001
2From: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> 2From: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
3Date: Tue, 21 Dec 2010 12:03:50 -0200 3Date: Tue, 21 Dec 2010 12:03:50 -0200
4Subject: [PATCH 3/5] MUX: Configure SYS_NIRQ2 pin in safe mode 4Subject: [PATCH 3/5] MUX: Configure SYS_NIRQ2 pin in safe mode
@@ -16,7 +16,7 @@ Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
16 1 files changed, 1 insertions(+), 1 deletions(-) 16 1 files changed, 1 insertions(+), 1 deletions(-)
17 17
18diff --git a/board/omap4430panda/omap4430panda.c b/board/omap4430panda/omap4430panda.c 18diff --git a/board/omap4430panda/omap4430panda.c b/board/omap4430panda/omap4430panda.c
19index 5695733..814b2cb 100644 19index a91e2aa..f6f515b 100644
20--- a/board/omap4430panda/omap4430panda.c 20--- a/board/omap4430panda/omap4430panda.c
21+++ b/board/omap4430panda/omap4430panda.c 21+++ b/board/omap4430panda/omap4430panda.c
22@@ -910,7 +910,7 @@ int dram_init(void) 22@@ -910,7 +910,7 @@ int dram_init(void)
diff --git a/recipes-bsp/x-load/x-load/0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch b/recipes-bsp/x-load/x-load/0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch
index 9b6e2f9d..e3107121 100644
--- a/recipes-bsp/x-load/x-load/0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch
+++ b/recipes-bsp/x-load/x-load/0004-OMAP4-clocks-Disable-slimbus-and-pad_clks.patch
@@ -1,4 +1,4 @@
1From 4af562525c7779cd41ae9a68d56771407df558d7 Mon Sep 17 00:00:00 2001 1From 14a48e4b24aee2387f8e4cd3b480236451fe1294 Mon Sep 17 00:00:00 2001
2From: Rajendra Nayak <rnayak@ti.com> 2From: Rajendra Nayak <rnayak@ti.com>
3Date: Mon, 4 Oct 2010 18:49:18 +0530 3Date: Mon, 4 Oct 2010 18:49:18 +0530
4Subject: [PATCH 4/5] OMAP4: clocks: Disable slimbus and pad_clks 4Subject: [PATCH 4/5] OMAP4: clocks: Disable slimbus and pad_clks
@@ -16,7 +16,7 @@ Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
16 1 files changed, 0 insertions(+), 3 deletions(-) 16 1 files changed, 0 insertions(+), 3 deletions(-)
17 17
18diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c 18diff --git a/board/omap4430panda/clock.c b/board/omap4430panda/clock.c
19index 0961f51..c591a9f 100644 19index 4404cc5..e41f327 100644
20--- a/board/omap4430panda/clock.c 20--- a/board/omap4430panda/clock.c
21+++ b/board/omap4430panda/clock.c 21+++ b/board/omap4430panda/clock.c
22@@ -333,9 +333,6 @@ static void configure_abe_dpll(u32 clk_index) 22@@ -333,9 +333,6 @@ static void configure_abe_dpll(u32 clk_index)
diff --git a/recipes-bsp/x-load/x-load/0005-omap4-Make-1GHz-as-default-MPU-clock.patch b/recipes-bsp/x-load/x-load/0005-omap4-Make-1GHz-as-default-MPU-clock.patch
index 7c23f604..3008e6da 100644
--- a/recipes-bsp/x-load/x-load/0005-omap4-Make-1GHz-as-default-MPU-clock.patch
+++ b/recipes-bsp/x-load/x-load/0005-omap4-Make-1GHz-as-default-MPU-clock.patch
@@ -1,4 +1,4 @@
1From ce1ae065d5eb875990f55ede0405e061e4d4b8d3 Mon Sep 17 00:00:00 2001 1From 76ebc9fdbfff91f226bc559706e3e7ece43ec30d Mon Sep 17 00:00:00 2001
2From: Sebastien Jan <s-jan@ti.com> 2From: Sebastien Jan <s-jan@ti.com>
3Date: Wed, 22 Dec 2010 13:53:18 +0100 3Date: Wed, 22 Dec 2010 13:53:18 +0100
4Subject: [PATCH 5/5] omap4: Make 1GHz as default MPU clock 4Subject: [PATCH 5/5] omap4: Make 1GHz as default MPU clock
@@ -9,18 +9,19 @@ Signed-off-by: Santosh Shilimkar <santosh.shilimkar@ti.com>
9Signed-off-by: Sebastien Jan <s-jan@ti.com> 9Signed-off-by: Sebastien Jan <s-jan@ti.com>
10Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com> 10Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@canonical.com>
11--- 11---
12 Makefile | 8 ++++++++ 12 Makefile | 9 +++++++++
13 include/configs/omap4430panda.h | 1 - 13 include/configs/omap4430panda.h | 1 -
14 2 files changed, 8 insertions(+), 1 deletions(-) 14 2 files changed, 9 insertions(+), 1 deletions(-)
15 15
16diff --git a/Makefile b/Makefile 16diff --git a/Makefile b/Makefile
17index d134fdc..1c4fdd5 100644 17index fd85142..6258324 100644
18--- a/Makefile 18--- a/Makefile
19+++ b/Makefile 19+++ b/Makefile
20@@ -170,6 +170,14 @@ omap3530beagle_config : unconfig 20@@ -235,6 +235,15 @@ igep0020_config : unconfig
21 ######################################################################### 21 #########################################################################
22 omap4430panda_config : unconfig 22 omap4430panda_config : unconfig
23 @./mkconfig $(@:_config=) arm omap4 omap4430panda 23 @./mkconfig $(@:_config=) arm omap4 omap4430panda 1
24+ @./mkconfig $(@:_config=) arm omap4 omap4430panda 1
24+ @[ -n "$(findstring _MPU_600MHz,$@)" ] || \ 25+ @[ -n "$(findstring _MPU_600MHz,$@)" ] || \
25+ { echo "#define CONFIG_MPU_1000 1" >> $(obj)include/config.h; \ 26+ { echo "#define CONFIG_MPU_1000 1" >> $(obj)include/config.h; \
26+ echo "MPU at 1GHz revision.."; \ 27+ echo "MPU at 1GHz revision.."; \
diff --git a/recipes-bsp/x-load/x-load_git.bb b/recipes-bsp/x-load/x-load_git.bb
index 4ab0a34f..5be261b7 100644
--- a/recipes-bsp/x-load/x-load_git.bb
+++ b/recipes-bsp/x-load/x-load_git.bb
@@ -3,10 +3,10 @@ require x-load.inc
3#FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}" 3#FILESPATHPKG_prepend = "x-load-git:x-load-git/${MACHINE}"
4 4
5PV = "1.44+${PR}+gitr${SRCREV}" 5PV = "1.44+${PR}+gitr${SRCREV}"
6PR ="r17" 6PR ="r20"
7PE = "1" 7PE = "1"
8 8
9SRCREV_pn-${PN} = "6f3a26101303051e0f91b6213735b68ce804e94e" 9SRCREV_pn-${PN} = "24b8b7f41a83540433024854736518876257672c"
10SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \ 10SRC_URI = "git://gitorious.org/x-loader/x-loader.git;branch=master;protocol=git \
11 file://0001-OMAP4-clocks-Enable-only-required-clks.patch \ 11 file://0001-OMAP4-clocks-Enable-only-required-clks.patch \
12 file://0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch \ 12 file://0002-OMAP4-Select-DPLL-PER-Clock-as-source-for-SGX-FCLK.patch \
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-19 12:43:44 +0000