Skip to contentSkip to conversation

ARM: omap3-beagle{-xm}: evm: Add OF_CONTROL support

PATCH New Derald D. Woods 2 participants 5 messages Dec 29, 2017 – Jan 19, 2018 Arm (32-bit)

lore
Share & tools
lore

Derald D. Woods

author
#0 lore raw

cover ARM: omap3-beagle{-xm}: evm: Add OF_CONTROL support

This series adds OF_CONTROL support for BeagleBoard and BeagleBoard-xM.

Devicetree files are taken from Linux v4.15-rc5.

Note that this is a follow-up to this previous patch series:

https://lists.denx.de/pipermail/u-boot/2017-December/314672.html

Tested using GCC 7.2.0 [--with-float=hard --with-mode=thumb]

Derald D. Woods (2):
ARM: dts: omap3-beagle{-xm}: Add support for BeagleBoard
ARM: dts: omap3-beagle{-xm}: Enable DM and devicetree for BeagleBoard

 arch/arm/dts/Makefile                       |   5 +
 arch/arm/dts/omap3-beagle-u-boot.dtsi       |  29 ++
 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi |  29 ++
 arch/arm/dts/omap3-beagle-xm-ab.dts         |  16 +
 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi    |  29 ++
 arch/arm/dts/omap3-beagle-xm.dts            | 409 ++++++++++++++++++++++++++
 arch/arm/dts/omap3-beagle.dts               | 436 ++++++++++++++++++++++++++++
 board/ti/beagle/beagle.c                    |  11 +
 configs/omap3_beagle_defconfig              |   5 +
 include/configs/omap3_beagle.h              | 145 ++++-----
 10 files changed, 1022 insertions(+), 92 deletions(-)
 create mode 100644 arch/arm/dts/omap3-beagle-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm-ab.dts
 create mode 100644 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm.dts
 create mode 100644 arch/arm/dts/omap3-beagle.dts
Signature · 1 line
2.15.1
author
#1 lore raw

PATCH 1/2 ARM: dts: omap3-beagle{-xm}: Add support for BeagleBoard

This commit adds OMAP3 BeagleBoard devicetree files from Linux v4.15-rc5. This includes standard OMAP34XX board revisions as well as the 'xM' which is OMAP36XX.

Signed-off-by Derald D. Woods <[email protected]>
---
 arch/arm/dts/Makefile                       |   5 +
 arch/arm/dts/omap3-beagle-u-boot.dtsi       |  29 ++
 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi |  29 ++
 arch/arm/dts/omap3-beagle-xm-ab.dts         |  16 +
 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi    |  29 ++
 arch/arm/dts/omap3-beagle-xm.dts            | 409 ++++++++++++++++++++++++++
 arch/arm/dts/omap3-beagle.dts               | 436 ++++++++++++++++++++++++++++
 7 files changed, 953 insertions(+)
 create mode 100644 arch/arm/dts/omap3-beagle-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm-ab.dts
 create mode 100644 arch/arm/dts/omap3-beagle-xm-u-boot.dtsi
 create mode 100644 arch/arm/dts/omap3-beagle-xm.dts
 create mode 100644 arch/arm/dts/omap3-beagle.dts
arch/arm/dts/Makefile +5 -0
index a895c70284..7cf6ef8bc4 100644
@@ -438,6 +438,11 @@ dtb-$(CONFIG_TARGET_OMAP3_EVM) += \
 	omap3-evm-37xx.dtb \
 	omap3-evm.dtb
 
+dtb-$(CONFIG_TARGET_OMAP3_BEAGLE) += \
+	omap3-beagle-xm-ab.dtb \
+	omap3-beagle-xm.dtb \
+	omap3-beagle.dtb
+
 dtb-$(CONFIG_TARGET_SAMA5D2_PTC_EK) += \
 	at91-sama5d2_ptc_ek.dtb
arch/arm/dts/omap3-beagle-u-boot.dtsi new file +29 -0
new file mode 100644
index 0000000000..5325f0ffa4
@@ -0,0 +1,29 @@
+/*
+ * U-Boot additions
+ *
+ * (C) Copyright 2017 Derald D. Woods <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/ {
+	chosen {
+		stdout-path = &uart3;
+	};
+};
+
+&mmc1 {
+	cd-inverted;
+};
+
+&uart1 {
+	reg-shift = <2>;
+};
+
+&uart2 {
+	reg-shift = <2>;
+};
+
+&uart3 {
+	reg-shift = <2>;
+};
arch/arm/dts/omap3-beagle-xm-ab-u-boot.dtsi new file +29 -0
new file mode 100644
index 0000000000..5325f0ffa4
@@ -0,0 +1,29 @@
+/*
+ * U-Boot additions
+ *
+ * (C) Copyright 2017 Derald D. Woods <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/ {
+	chosen {
+		stdout-path = &uart3;
+	};
+};
+
+&mmc1 {
+	cd-inverted;
+};
+
+&uart1 {
+	reg-shift = <2>;
+};
+
+&uart2 {
+	reg-shift = <2>;
+};
+
+&uart3 {
+	reg-shift = <2>;
+};
arch/arm/dts/omap3-beagle-xm-ab.dts new file +16 -0
new file mode 100644
index 0000000000..7ac3bcf59d
@@ -0,0 +1,16 @@
+/*
+ * Copyright (C) 2011 Texas Instruments Incorporated - http://www.ti.com/
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation.
+ */
+
+#include "omap3-beagle-xm.dts"
+
+/ {
+	/* HS USB Port 2 Power enable was inverted with the xM C */
+	hsusb2_power: hsusb2_power_reg {
+		enable-active-high;
+	};
+};
arch/arm/dts/omap3-beagle-xm-u-boot.dtsi new file +29 -0
new file mode 100644
index 0000000000..5325f0ffa4
@@ -0,0 +1,29 @@
+/*
+ * U-Boot additions
+ *
+ * (C) Copyright 2017 Derald D. Woods <[email protected]>
+ *
+ * SPDX-License-Identifier:    GPL-2.0+
+ */
+
+/ {
+	chosen {
+		stdout-path = &uart3;
+	};
+};
+
+&mmc1 {
+	cd-inverted;
+};
+
+&uart1 {
+	reg-shift = <2>;
+};
+
+&uart2 {
+	reg-shift = <2>;
+};
+
+&uart3 {
+	reg-shift = <2>;
+};
arch/arm/dts/omap3-beagle-xm.dts new file +409 -0

409 lines not on this page · raw message

arch/arm/dts/omap3-beagle.dts new file +436 -0

436 lines not on this page · raw message

Signature · 1 line
2.15.1
#2 lore raw

PATCH 1/2 ARM: dts: omap3-beagle{-xm}: Add support for BeagleBoard

Quoted 5 lines · Derald D. Woods

This commit adds OMAP3 BeagleBoard devicetree files from Linux v4.15-rc5. This includes standard OMAP34XX board revisions as well as the 'xM' which is OMAP36XX.

Signed-off-by Derald D. Woods <[email protected]>

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/e7160a92/attachment.sig>
author
#3 lore raw

PATCH 2/2 ARM: dts: omap3-beagle{-xm}: Enable DM and devicetree for BeagleBoard

In reply to Derald D. Woods

This commit updates the configuration files needed to support OF_CONTROL on the OMAP3 BeagleBoard(s).

---
 board/ti/beagle/beagle.c       |  11 ++++
 configs/omap3_beagle_defconfig |   5 ++
 include/configs/omap3_beagle.h | 145 +++++++++++++++--------------------------
 3 files changed, 69 insertions(+), 92 deletions(-)
board/ti/beagle/beagle.c +11 -0
index bdf84b0be8..d8402f2675 100644
@@ -103,6 +103,17 @@ int board_init(void)
 	return 0;
 }
 
+#if defined(CONFIG_SPL_OS_BOOT)
+int spl_start_uboot(void)
+{
+	/* break into full u-boot on 'c' */
+	if (serial_tstc() && serial_getc() == 'c')
+		return 1;
+
+	return 0;
+}
+#endif /* CONFIG_SPL_OS_BOOT */
+
 /*
  * Routine: get_board_revision
  * Description: Detect if we are running on a Beagle revision Ax/Bx,
configs/omap3_beagle_defconfig +5 -0
index ad7207909b..95c8784888 100644
@@ -2,9 +2,11 @@ CONFIG_ARM=y
 CONFIG_ARCH_OMAP2PLUS=y
 CONFIG_SYS_TEXT_BASE=0x80100000
 CONFIG_TARGET_OMAP3_BEAGLE=y
+CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle"
 CONFIG_DISTRO_DEFAULTS=y
 # CONFIG_USE_BOOTCOMMAND is not set
 CONFIG_SYS_CONSOLE_INFO_QUIET=y
+CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb"
 CONFIG_VERSION_VARIABLE=y
 CONFIG_SPL=y
 CONFIG_SPL_MTD_SUPPORT=y

@@ -26,7 +28,9 @@ CONFIG_CMD_EXT4_WRITE=y
 CONFIG_CMD_MTDPARTS=y
 CONFIG_MTDIDS_DEFAULT="nand0=nand"
 CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
+CONFIG_OF_CONTROL=y
 CONFIG_ENV_IS_IN_NAND=y
+# CONFIG_BLK is not set
 CONFIG_LED_STATUS=y
 CONFIG_LED_STATUS0=y
 CONFIG_LED_STATUS_BIT=1

@@ -59,4 +63,5 @@ CONFIG_USB_ETHER_ASIX=y
 CONFIG_USB_ETHER_MCS7830=y
 CONFIG_USB_ETHER_SMSC95XX=y
 CONFIG_FAT_WRITE=y
+CONFIG_BCH=y
 CONFIG_OF_LIBFDT=y
include/configs/omap3_beagle.h +53 -92

197 lines not on this page · raw message

Signature · 1 line
2.15.1
#4 lore raw

PATCH 2/2 ARM: dts: omap3-beagle{-xm}: Enable DM and devicetree for BeagleBoard

Quoted 2 lines · Derald D. Woods

This commit updates the configuration files needed to support OF_CONTROL on the OMAP3 BeagleBoard(s).

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180119/f0400ebf/attachment.sig>