From mboxrd@z Thu Jan 1 00:00:00 1970 From: Hans de Goede Date: Thu, 16 Oct 2014 10:50:42 +0200 Subject: [U-Boot] [PATCH] sunxi: Add CONFIG_MACH_TYPE defines to sun4i, sun5i and sun7i In-Reply-To: <20141015134843.32f9b299@i7> References: <1413204935-9157-1-git-send-email-hdegoede@redhat.com> <20141015134843.32f9b299@i7> Message-ID: <543F86E2.3060201@redhat.com> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Hi, On 10/15/2014 12:48 PM, Siarhei Siamashka wrote: > On Mon, 13 Oct 2014 14:55:35 +0200 > Hans de Goede wrote: > >> Many people are still using old linux-sunxi-3.4 kernels on sunxi devices, >> adding the proper MACH_TYPE defines for this allows people to switch to >> upstream u-boot, so that we can stop maintaining the linux-sunxi u-boot fork. >> >> These machine-ids are all properly registered at: >> >> http://www.arm.linux.org.uk/developer/machines/ >> >> Signed-off-by: Hans de Goede >> --- >> include/configs/sun4i.h | 1 + >> include/configs/sun5i.h | 1 + >> include/configs/sun7i.h | 1 + >> 3 files changed, 3 insertions(+) >> >> diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h >> index 5611ecc..d0191a3 100644 >> --- a/include/configs/sun4i.h >> +++ b/include/configs/sun4i.h >> @@ -15,6 +15,7 @@ >> #define CONFIG_CLK_FULL_SPEED 1008000000 >> >> #define CONFIG_SYS_PROMPT "sun4i# " >> +#define CONFIG_MACH_TYPE 4104 >> >> #ifdef CONFIG_USB_EHCI >> #define CONFIG_USB_EHCI_SUNXI >> diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h >> index 6066371..7b683e9 100644 >> --- a/include/configs/sun5i.h >> +++ b/include/configs/sun5i.h >> @@ -15,6 +15,7 @@ >> #define CONFIG_CLK_FULL_SPEED 1008000000 >> >> #define CONFIG_SYS_PROMPT "sun5i# " >> +#define CONFIG_MACH_TYPE 4138 >> >> #ifdef CONFIG_USB_EHCI >> #define CONFIG_USB_EHCI_SUNXI >> diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h >> index a902b84..966cbd8 100644 >> --- a/include/configs/sun7i.h >> +++ b/include/configs/sun7i.h >> @@ -16,6 +16,7 @@ >> #define CONFIG_CLK_FULL_SPEED 912000000 >> >> #define CONFIG_SYS_PROMPT "sun7i# " >> +#define CONFIG_MACH_TYPE 4283 >> >> #ifdef CONFIG_USB_EHCI >> #define CONFIG_USB_EHCI_SUNXI > > This patch is just trying to remove the safety guards (which exist > there for a reason!) without addressing the real compatibility > issues. Erm, no the mach_type-s are not "safety-guards", they are absolutely necessary to get old non devicetree kernels to work at all. With just this single patch, sunxi-3.4 kernels with fixed PLL5 support, will happily boot on sun4i and sun5i. And with the bootm_boot_mode patch + env setting sun7i will boot fine too. Regards, Hans