From 233c583f9a7460201c77dc39eb13c00eefe25db5 Mon Sep 17 00:00:00 2001 From: Peter Robinson Date: Wed, 5 Apr 2017 09:25:12 +0100 Subject: [PATCH] add upstream patches for new BeagleBones --- bbone-new-devices.patch | 197 ++++++++++++++++++++++++++++++++++++++++ uboot-tools.spec | 1 + 2 files changed, 198 insertions(+) create mode 100644 bbone-new-devices.patch diff --git a/bbone-new-devices.patch b/bbone-new-devices.patch new file mode 100644 index 0000000..3d56db4 --- /dev/null +++ b/bbone-new-devices.patch @@ -0,0 +1,197 @@ +From patchwork Thu Mar 30 19:29:52 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot,1/3] config: am335x_evm: detect Black Wireless using BWA +From: robertcnelson@gmail.com +X-Patchwork-Id: 745389 +Message-Id: <20170330192954.22673-1-robertcnelson@gmail.com> +To: u-boot@lists.denx.de +Cc: Tom Rini , Jason Kridner , + Will Newton +Date: Thu, 30 Mar 2017 14:29:52 -0500 + +BeagleBone Black Wireless is clone of the BeagleBone Black (BBB) with +the Ethernet replaced by a TI wl1835 wireless module. + +This board can be indentified by the BWAx value after A335BNLT (BBB) +in the at24 eeprom: +BWAx [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 57 41 35 |.U3.A335BNLTBWA5|] + +http://beagleboard.org/black-wireless +https://github.com/beagleboard/beaglebone-black-wireless + +firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware +wl18xx mac address: /proc/device-tree/ocp/ethernet@4a100000/slave@4a100200/mac-address + +Signed-off-by: Robert Nelson +CC: Tom Rini +CC: Jason Kridner +CC: Will Newton +Reviewed-by: Tom Rini +--- + board/ti/am335x/board.c | 7 +++++++ + include/configs/am335x_evm.h | 2 ++ + 2 files changed, 9 insertions(+) + +diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c +index 8eaf3e9a5c..304ae34fb7 100644 +--- a/board/ti/am335x/board.c ++++ b/board/ti/am335x/board.c +@@ -651,6 +651,13 @@ int board_late_init(void) + #ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG + char *name = NULL; + ++ if (board_is_bone_lt()) { ++ /* BeagleBoard.org BeagleBone Black Wireless: */ ++ if (!strncmp(board_ti_get_rev(), "BWA", 3)) { ++ name = "BBBW"; ++ } ++ } ++ + if (board_is_bbg1()) + name = "BBG1"; + set_board_info_env(name); +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index 27126871f7..dcac2f5816 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -138,6 +138,8 @@ + "setenv fdtfile am335x-bone.dtb; fi; " \ + "if test $board_name = A335BNLT; then " \ + "setenv fdtfile am335x-boneblack.dtb; fi; " \ ++ "if test $board_name = BBBW; then " \ ++ "setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \ + "if test $board_name = BBG1; then " \ + "setenv fdtfile am335x-bonegreen.dtb; fi; " \ + "if test $board_name = A33515BB; then " \ +From patchwork Thu Mar 30 19:29:53 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot,2/3] config: am335x_evm: detect Green Wireless using GW1 +From: robertcnelson@gmail.com +X-Patchwork-Id: 745390 +Message-Id: <20170330192954.22673-2-robertcnelson@gmail.com> +To: u-boot@lists.denx.de +Cc: Tom Rini , Jason Kridner , + Will Newton +Date: Thu, 30 Mar 2017 14:29:53 -0500 + +SeeedStudio BeagleBone Green Wireless (BBGW) is an expansion of the +SeeedStudio Green (BBG) with the Ethernet replaced by a TI wl1835 +wireless module. + +This board can be indentified by the GW1x value after A335BNLT (BBB) +in the at24 eeprom: +GW1x [aa 55 33 ee 41 33 33 35 42 4e 4c 54 47 57 31 41 |.U3.A335BNLTGW1A|] + +http://beagleboard.org/green-wireless +http://wiki.seeed.cc/BeagleBone_Green_Wireless/ + +firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware +wl18xx mac address: Stored in at24 eeprom at address 5-16: +hexdump -e '8/1 "%c"' /sys/bus/i2c/devices/0-0050/eeprom | cut -b 5-16 + +Signed-off-by: Robert Nelson +CC: Tom Rini +CC: Jason Kridner +CC: Will Newton +Reviewed-by: Tom Rini +--- + board/ti/am335x/board.c | 4 ++++ + include/configs/am335x_evm.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c +index 304ae34fb7..54589638b3 100644 +--- a/board/ti/am335x/board.c ++++ b/board/ti/am335x/board.c +@@ -656,6 +656,10 @@ int board_late_init(void) + if (!strncmp(board_ti_get_rev(), "BWA", 3)) { + name = "BBBW"; + } ++ /* SeeedStudio BeagleBone Green Wireless */ ++ if (!strncmp(board_ti_get_rev(), "GW1", 3)) { ++ name = "BBGW"; ++ } + } + + if (board_is_bbg1()) +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index dcac2f5816..d90c5156d3 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -142,6 +142,8 @@ + "setenv fdtfile am335x-boneblack-wireless.dtb; fi; " \ + "if test $board_name = BBG1; then " \ + "setenv fdtfile am335x-bonegreen.dtb; fi; " \ ++ "if test $board_name = BBGW; then " \ ++ "setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \ + "if test $board_name = A33515BB; then " \ + "setenv fdtfile am335x-evm.dtb; fi; " \ + "if test $board_name = A335X_SK; then " \ +From patchwork Thu Mar 30 19:29:54 2017 +Content-Type: text/plain; charset="utf-8" +MIME-Version: 1.0 +Content-Transfer-Encoding: 7bit +Subject: [U-Boot,3/3] config: am335x_evm: detect BeagleBone Blue using BLA +From: robertcnelson@gmail.com +X-Patchwork-Id: 745391 +Message-Id: <20170330192954.22673-3-robertcnelson@gmail.com> +To: u-boot@lists.denx.de +Cc: Tom Rini , Jason Kridner , + Will Newton +Date: Thu, 30 Mar 2017 14:29:54 -0500 + +BeagleBone Blue is next grenation of boards from BeagleBoard.org, focusing +on robotics with a TI wl1835 wireless module for connectivity. + +This board can be indentified by the BLAx value after A335BNLT (BBB) +in the at24 eeprom: +BLAx: [aa 55 33 ee 41 33 33 35 42 4e 4c 54 42 4c 41 30 |.U3.A335BNLTBLA2|] + +http://beagleboard.org/blue +https://github.com/beagleboard/beaglebone-blue + +firmware: https://github.com/beagleboard/beaglebone-black-wireless/tree/master/firmware +wl18xx mac address: /proc/device-tree/ocp/ethernet@4a100000/slave@4a100200/mac-address + +Signed-off-by: Robert Nelson +CC: Tom Rini +CC: Jason Kridner +CC: Will Newton +Reviewed-by: Tom Rini +--- + board/ti/am335x/board.c | 4 ++++ + include/configs/am335x_evm.h | 2 ++ + 2 files changed, 6 insertions(+) + +diff --git a/board/ti/am335x/board.c b/board/ti/am335x/board.c +index 54589638b3..3e842d3187 100644 +--- a/board/ti/am335x/board.c ++++ b/board/ti/am335x/board.c +@@ -660,6 +660,10 @@ int board_late_init(void) + if (!strncmp(board_ti_get_rev(), "GW1", 3)) { + name = "BBGW"; + } ++ /* BeagleBoard.org BeagleBone Blue */ ++ if (!strncmp(board_ti_get_rev(), "BLA", 3)) { ++ name = "BBBL"; ++ } + } + + if (board_is_bbg1()) +diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h +index d90c5156d3..5fbc1e3ff9 100644 +--- a/include/configs/am335x_evm.h ++++ b/include/configs/am335x_evm.h +@@ -144,6 +144,8 @@ + "setenv fdtfile am335x-bonegreen.dtb; fi; " \ + "if test $board_name = BBGW; then " \ + "setenv fdtfile am335x-bonegreen-wireless.dtb; fi; " \ ++ "if test $board_name = BBBL; then " \ ++ "setenv fdtfile am335x-boneblue.dtb; fi; " \ + "if test $board_name = A33515BB; then " \ + "setenv fdtfile am335x-evm.dtb; fi; " \ + "if test $board_name = A335X_SK; then " \ diff --git a/uboot-tools.spec b/uboot-tools.spec index 8b7577c..367d355 100644 --- a/uboot-tools.spec +++ b/uboot-tools.spec @@ -18,6 +18,7 @@ Patch3: U-Boot-2-2-rsa-Fix-deprecated-warnings-for-OpenSSL-1.1.x.patch Patch4: tools-kwbimage-fix-build-with-OpenSSL-1.1.x.patch Patch5: mx6cuboxi-Add-support-for-sata.patch Patch6: mx6-Initial-Hummingboard-2-support.patch +Patch7: bbone-new-devices.patch Patch8: U-Boot-v2-Makefile-Fix-linking-with-modern-binutils.patch # Patch9: 0001-arm-mvebu-enable-generic-distro-boot-config.patch