diff options
author | Gabor Juhos <juhosg@openwrt.org> | 2012-04-22 07:20:55 +0000 |
---|---|---|
committer | Gabor Juhos <juhosg@openwrt.org> | 2012-04-22 07:20:55 +0000 |
commit | 2e76284293f5d1e725f7ddb0a1cfafe12cb354a0 (patch) | |
tree | d643636d35a54e4446791336051c2ae730fc9984 /target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch | |
parent | b154b50ea53275dc6d41ff6cca6bda76daef70ca (diff) | |
download | upstream-2e76284293f5d1e725f7ddb0a1cfafe12cb354a0.tar.gz upstream-2e76284293f5d1e725f7ddb0a1cfafe12cb354a0.tar.bz2 upstream-2e76284293f5d1e725f7ddb0a1cfafe12cb354a0.zip |
ep93xx: remove 2.6.39 support
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@31434 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch')
-rw-r--r-- | target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch | 59 |
1 files changed, 0 insertions, 59 deletions
diff --git a/target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch b/target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch deleted file mode 100644 index eafa72816e..0000000000 --- a/target/linux/ep93xx/patches-2.6.39/001-ep93xx_cpuinfo.patch +++ /dev/null @@ -1,59 +0,0 @@ -This patch puts the EP93xx chip revision and unique ID into /proc/cpuinfo. -This is necessary to be able to set a unique MAC address for DHCP purposes -by adding a line to /etc/network/interfaces: - -# Generate a unique locally-assigned MAC address from the CPU serial number -pre-up ifconfig eth0 hw ether `sed -n 's/^Serial.* 000000/02/p' /proc/cpuinfo` - -It uses the chip revision reading code in the ep93xx-chip-revision patch. - -Really, this is wrong, since /proc/cpuinfo should report the revision and -serial number of the ARM920T processor, while these are the rev and serial -of the EP93xx SoC. In a future kernel (>2.6.34) there may be a new file -/proc/socinfo for this information. - - -martinwguy 14 May 2010 - ---- a/arch/arm/kernel/setup.c -+++ b/arch/arm/kernel/setup.c -@@ -48,6 +48,12 @@ - #include <asm/traps.h> - #include <asm/unwind.h> - -+#if defined(CONFIG_ARCH_EP93XX) -+#include <mach/io.h> -+#include <mach/ep93xx-regs.h> -+#include <mach/platform.h> -+#endif -+ - #if defined(CONFIG_DEPRECATED_PARAM_STRUCT) - #include "compat.h" - #endif -@@ -1005,9 +1011,16 @@ static int c_show(struct seq_file *m, vo - seq_puts(m, "\n"); - - seq_printf(m, "Hardware\t: %s\n", machine_name); -+#if defined(CONFIG_ARCH_EP93XX) -+ seq_printf(m, "Revision\t: %04x\n", -+ ep93xx_chip_revision()); -+ seq_printf(m, "Serial\t\t: %016x\n", -+ *((unsigned int *)EP93XX_SECURITY_UNIQID)); -+#else - seq_printf(m, "Revision\t: %04x\n", system_rev); - seq_printf(m, "Serial\t\t: %08x%08x\n", - system_serial_high, system_serial_low); -+#endif - - return 0; - } ---- a/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -+++ b/arch/arm/mach-ep93xx/include/mach/ep93xx-regs.h -@@ -97,6 +97,8 @@ - #define EP93XX_I2S_BASE EP93XX_APB_IOMEM(0x00020000) - - #define EP93XX_SECURITY_BASE EP93XX_APB_IOMEM(0x00030000) -+#define EP93XX_SECURITY_REG(x) (EP93XX_SECURITY_BASE + (x)) -+#define EP93XX_SECURITY_UNIQID EP93XX_SECURITY_REG(0x2440) - - #define EP93XX_GPIO_BASE EP93XX_APB_IOMEM(0x00040000) - #define EP93XX_GPIO_REG(x) (EP93XX_GPIO_BASE + (x)) |