Skip to content

Commit

Permalink
am335x_evm: allow user to adjust buffer size
Browse files Browse the repository at this point in the history 
Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
  • Loading branch information
@RobertCNelson
RobertCNelson committed Jan 18, 2017
1 parent 7086003 commit 6f3929a
Show file tree
Hide file tree
Showing 3 changed files with 43 additions and 34 deletions.
5 changes: 3 additions & 2 deletions build.sh
View file
Expand Up @@ -426,8 +426,9 @@ build_u_boot () {
#r6: am335x_evm: enable_uboot_overlays=1 & bone_capemgr.uboot_capemgr_enabled=1
#r7: am335x_evm: fdt fixes...
#r8: am335x_evm: fdt resize 0x60000
#r9: (pending)
RELEASE_VER="-r8" #bump on every change...
#r9: am335x_evm: allow user to adjust buffer size
#r10: (pending)
RELEASE_VER="-r9" #bump on every change...
#halt_patching_uboot

case "${board}" in
Expand Down
36 changes: 20 additions & 16 deletions patches/next/0002-U-Boot-BeagleBone-Cape-Manager.patch
View file
@@ -1,6 +1,6 @@
From b2aacc132ac9f35ad8b5fa24ac8d564908c030bc Mon Sep 17 00:00:00 2001
From 00664d602414d12a9826a50002c28c8de2552673 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 30 Dec 2016 11:24:44 -0600
Date: Wed, 18 Jan 2017 12:57:43 -0600
Subject: [PATCH 2/2] U-Boot: BeagleBone Cape Manager

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Expand All @@ -9,9 +9,9 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
board/ti/am335x/board.c | 99 +++++++++++++++++++++++++++++++
board/ti/am335x/board.h | 17 ++++++
board/ti/am335x/mux.c | 15 +++++
include/configs/ti_armv7_common.h | 73 +++++++++++++++++++++++
include/configs/ti_armv7_common.h | 77 ++++++++++++++++++++++++
include/configs/ti_armv7_omap.h | 3 +
6 files changed, 208 insertions(+)
6 files changed, 212 insertions(+)

diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index 7b841b2d55..119ca3d62c 100644
Expand Down Expand Up @@ -227,23 +227,27 @@ index 6d65e99a1a..2ae077fb14 100644
configure_module_pin_mux(mmc0_pin_mux);
configure_module_pin_mux(gpio0_18_pin_mux);
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 4b6cbb9e89..f6c668060a 100644
index 5ef1e8f18a..05c9c796ee 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -347,6 +347,79 @@
@@ -347,6 +347,83 @@
"fi;" \
"fi;" \
"fi; " \
+ "if test -n ${enable_uboot_overlays}; then " \
+ "if test -n ${uboot_fdt_buffer}; then " \
+ "setenv uboot_fdt_buffer 0x60000;" \
+ "fi;" \
+ "echo debug: [uboot_fdt_buffer=${uboot_fdt_buffer}] ... ;" \
+ "if test -n ${uboot_overlay_addr0}; then " \
+ "echo debug: [uboot_overlay_addr0=${uboot_overlay_addr0}] ... ;" \
+ "if test -e ${devtype} ${bootpart} ${uboot_overlay_addr0}; then " \
+ "echo loading ${uboot_overlay_addr0} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr0};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr0}]...;" \
Expand All @@ -255,9 +259,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr1} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr1};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr1}]...;" \
Expand All @@ -269,9 +273,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr2} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr2};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr2}]...;" \
Expand All @@ -283,9 +287,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr3} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr3};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr3}]...;" \
Expand All @@ -297,9 +301,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${dtb_overlay} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${dtb_overlay};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${dtb_overlay}]...;" \
+ "fi; " \
Expand Down
36 changes: 20 additions & 16 deletions patches/v2017.01/0002-U-Boot-BeagleBone-Cape-Manager.patch
View file
@@ -1,6 +1,6 @@
From b2aacc132ac9f35ad8b5fa24ac8d564908c030bc Mon Sep 17 00:00:00 2001
From 00664d602414d12a9826a50002c28c8de2552673 Mon Sep 17 00:00:00 2001
From: Robert Nelson <robertcnelson@gmail.com>
Date: Fri, 30 Dec 2016 11:24:44 -0600
Date: Wed, 18 Jan 2017 12:57:43 -0600
Subject: [PATCH 2/2] U-Boot: BeagleBone Cape Manager

Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
Expand All @@ -9,9 +9,9 @@ Signed-off-by: Robert Nelson <robertcnelson@gmail.com>
board/ti/am335x/board.c | 99 +++++++++++++++++++++++++++++++
board/ti/am335x/board.h | 17 ++++++
board/ti/am335x/mux.c | 15 +++++
include/configs/ti_armv7_common.h | 73 +++++++++++++++++++++++
include/configs/ti_armv7_common.h | 77 ++++++++++++++++++++++++
include/configs/ti_armv7_omap.h | 3 +
6 files changed, 208 insertions(+)
6 files changed, 212 insertions(+)

diff --git a/arch/arm/mach-omap2/am33xx/clock_am33xx.c b/arch/arm/mach-omap2/am33xx/clock_am33xx.c
index 7b841b2d55..119ca3d62c 100644
Expand Down Expand Up @@ -227,23 +227,27 @@ index 6d65e99a1a..2ae077fb14 100644
configure_module_pin_mux(mmc0_pin_mux);
configure_module_pin_mux(gpio0_18_pin_mux);
diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h
index 4b6cbb9e89..f6c668060a 100644
index 5ef1e8f18a..05c9c796ee 100644
--- a/include/configs/ti_armv7_common.h
+++ b/include/configs/ti_armv7_common.h
@@ -347,6 +347,79 @@
@@ -347,6 +347,83 @@
"fi;" \
"fi;" \
"fi; " \
+ "if test -n ${enable_uboot_overlays}; then " \
+ "if test -n ${uboot_fdt_buffer}; then " \
+ "setenv uboot_fdt_buffer 0x60000;" \
+ "fi;" \
+ "echo debug: [uboot_fdt_buffer=${uboot_fdt_buffer}] ... ;" \
+ "if test -n ${uboot_overlay_addr0}; then " \
+ "echo debug: [uboot_overlay_addr0=${uboot_overlay_addr0}] ... ;" \
+ "if test -e ${devtype} ${bootpart} ${uboot_overlay_addr0}; then " \
+ "echo loading ${uboot_overlay_addr0} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr0};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr0}]...;" \
Expand All @@ -255,9 +259,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr1} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr1};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr1}]...;" \
Expand All @@ -269,9 +273,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr2} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr2};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr2}]...;" \
Expand All @@ -283,9 +287,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${uboot_overlay_addr3} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${uboot_overlay_addr3};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "setenv cape_uboot bone_capemgr.uboot_capemgr_enabled=1; " \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${uboot_overlay_addr3}]...;" \
Expand All @@ -297,9 +301,9 @@ index 4b6cbb9e89..f6c668060a 100644
+ "echo loading ${dtb_overlay} ...;" \
+ "load ${devtype} ${bootpart} ${rdaddr} ${dtb_overlay};" \
+ "fdt addr ${fdtaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "fdt apply ${rdaddr};" \
+ "fdt resize 0x60000;" \
+ "fdt resize ${uboot_fdt_buffer};" \
+ "else " \
+ "echo unable to find [${devtype} ${bootpart} ${dtb_overlay}]...;" \
+ "fi; " \
Expand Down

0 comments on commit 6f3929a

Please sign in to comment.