linux-ti335x-psp 3.1rc8: add proper machine ID for beaglebone

Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
2026-05-29 23:12:45 +00:00 · 2011-10-18 21:31:27 +02:00
parent 5bea125f60
commit 851dca2023
5 changed files with 108 additions and 1 deletions
@@ -0,0 +1,22 @@
+From fff15650c35829def3e07712486850c0947ed255 Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 18 Oct 2011 19:27:24 +0200
+Subject: [PATCH 1/3] mach-types: Add new machine type beaglebone to mach-types
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/tools/mach-types |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/tools/mach-types b/arch/arm/tools/mach-types
+index a0743e1..971612d 100644
+--- a/arch/arm/tools/mach-types
+++ b/arch/arm/tools/mach-types
+@@ -1115,3 +1115,4 @@ ubisys_p9d_evp		MACH_UBISYS_P9D_EVP	UBISYS_P9D_EVP		3493
+ atdgp318		MACH_ATDGP318		ATDGP318		3494
+ am335xevm		MACH_AM335XEVM		AM335XEVM		3589
+ am335xiaevm		MACH_AM335XIAEVM	AM335XIAEVM		3684
+beaglebone		MACH_BEAGLEBONE		BEAGLEBONE		3808
+-- 
+1.6.6.1
+
@@ -0,0 +1,29 @@
+From 205b782fbc826983ea274dd55642cd6888f1c3df Mon Sep 17 00:00:00 2001
+From: Koen Kooi <koen@dominion.thruhere.net>
+Date: Tue, 18 Oct 2011 19:30:05 +0200
+Subject: [PATCH 2/3] Kconfig: Add support for beaglebone machine id.
+
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/Kconfig |    5 +++++
+ 1 files changed, 5 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/Kconfig b/arch/arm/mach-omap2/Kconfig
+index b0e1709..9be2982 100644
+--- a/arch/arm/mach-omap2/Kconfig
+++ b/arch/arm/mach-omap2/Kconfig
+@@ -331,6 +331,11 @@ config MACH_AM335XIAEVM
+ 	depends on SOC_OMAPAM33XX
+ 	default y
+ 
+config MACH_BEAGLEBONE
+	bool "AM335x BeagleBone, the most awesome AM335x board"
+	depends on SOC_OMAPAM33XX
+	default y
+
+ config MACH_OMAP_4430SDP
+ 	bool "OMAP 4430 SDP board"
+ 	default y
+-- 
+1.6.6.1
+
@@ -0,0 +1,52 @@
+From 66bec8f45fa501f5cb06f760b62882f43c7cfebd Mon Sep 17 00:00:00 2001
+From: Steve Kipisz <s-kipisz2@ti.com>
+Date: Thu, 13 Oct 2011 17:08:37 -0500
+Subject: [PATCH 3/3] am335xevm: Use new beaglebone machine id.
+
+Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
+Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
+---
+ arch/arm/mach-omap2/board-am335xevm.c |   23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/mach-omap2/board-am335xevm.c b/arch/arm/mach-omap2/board-am335xevm.c
+index 572cb87..e363c80 100644
+--- a/arch/arm/mach-omap2/board-am335xevm.c
+++ b/arch/arm/mach-omap2/board-am335xevm.c
+@@ -1242,6 +1242,19 @@ static void am335x_evm_setup(struct memory_accessor *mem_acc, void *context)
+ 	int ret;
+ 	char tmp[10];
+ 
+	/* Eventually when we have device tree support, u-boot will
+	 * read the EEPROMs and pass flattened device trees to the
+	 * kernel. For beaglebone, u-boot will read the EEPROM and
+	 * pass the machine type to the kernel.
+	 */
+	if (machine_is_beaglebone()) {
+		pr_info("Board name: AM335BONE\n");
+		daughter_brd_detected = false;
+		setup_beaglebone();
+		am33xx_cpsw_init();
+		return;
+	}
+
+ 	/* get board specific data */
+ 	ret = mem_acc->read(mem_acc, (char *)&config, 0, sizeof(config));
+ 	if (ret != sizeof(config)) {
+@@ -1523,3 +1536,13 @@ MACHINE_START(AM335XIAEVM, "am335xiaevm")
+ 	.timer		= &omap3_am33xx_timer,
+ 	.init_machine	= am335x_evm_init,
+ MACHINE_END
+
+MACHINE_START(BEAGLEBONE, "beaglebone")
+	/* Maintainer: Texas Instruments */
+	.atag_offset	= 0x100,
+	.map_io		= am335x_evm_map_io,
+	.init_irq	= ti816x_init_irq,
+	.init_early	= am335x_init_early,
+	.timer		= &omap3_am33xx_timer,
+	.init_machine	= am335x_evm_init,
+MACHINE_END
+-- 
+1.6.6.1
+
@@ -345,6 +345,7 @@ CONFIG_MACH_IGEP0020=y
 CONFIG_MACH_TI8168EVM=y
 CONFIG_MACH_AM335XEVM=y
 CONFIG_MACH_AM335XIAEVM=y
+CONFIG_MACH_BEAGLEBONE=y
 # CONFIG_OMAP3_EMU is not set
 # CONFIG_OMAP3_SDRC_AC_TIMING is not set
 CONFIG_OMAP3_EDMA=y
@@ -11,7 +11,7 @@ MULTI_CONFIG_BASE_SUFFIX = ""

 BRANCH = "master"
 SRCREV = "10a9c95f6713ce4f7db7088443676808ca79a851"
-MACHINE_KERNEL_PR_append = "b+gitr${SRCREV}"
+MACHINE_KERNEL_PR_append = "c+gitr${SRCREV}"

 COMPATIBLE_MACHINE = "(ti33x)"

@@ -27,6 +27,9 @@ SRC_URI += "git://arago-project.org/git/projects/linux-am33x.git;protocol=git;br
 PATCHES_OVER_PSP = " \
 	file://0001-f_rndis-HACK-around-undefined-variables.patch \
 	file://0001-am335x-evm-hack-in-LED-support-for-beaglebone.patch \
+	file://0001-mach-types-Add-new-machine-type-beaglebone-to-mach-t.patch \
+	file://0002-Kconfig-Add-support-for-beaglebone-machine-id.patch \
+	file://0003-am335xevm-Use-new-beaglebone-machine-id.patch \
 	"

 SRC_URI += "${@base_contains('DISTRO_FEATURES', 'tipspkernel', "", "${PATCHES_OVER_PSP}", d)}"