Currently for each SoC of the Atmel AT91SAM926x series a new platformtype
is created. However, these cores look very much the same so, a new platform
define for each of these SoC is overkill.
Notice that the same compiler configuration/flags can be used to support all
these cores, even the same kernel build/configuration can be used across these
SoC-types.
This patch merges them all together to 1 generic type. (Notice that the
AT91RM9200 is a completely different CPU, so it should remain its own platform
type.)
Note: The AT91Bootstrap build depends on the define ARCH_ARM_AT91SAM926X
Signed-off-by: Remy Bohmer <[EMAIL PROTECTED]>
---
platforms/architecture.in | 10 +++-------
rules/ffmpeg.make | 11 +----------
2 files changed, 4 insertions(+), 17 deletions(-)
Index: ptxdist-trunk/platforms/architecture.in
===================================================================
--- ptxdist-trunk.orig/platforms/architecture.in 2008-08-05
22:45:06.000000000 +0200
+++ ptxdist-trunk/platforms/architecture.in 2008-08-05 22:49:48.000000000
+0200
@@ -90,11 +90,8 @@ choice
config ARCH_ARM_AT91RM9200
bool "at91rm9200 "
- config ARCH_ARM_AT91SAM9260
- bool "at91sam9260"
-
- config ARCH_ARM_AT91SAM9263
- bool "at91sam9263"
+ config ARCH_ARM_AT91SAM926X
+ bool "at91sam926x"
config ARM_ARM_EPXA
bool "excalibur "
@@ -212,8 +209,7 @@ config ENDIAN_LITTLE
default y if MENU_ENDIAN_LITTLE
default y if ARCH_ARM_ATMEL
default y if ARCH_ARM_AT91RM9200
- default y if ARCH_ARM_AT91SAM9260
- default y if ARCH_ARM_AT91SAM9263
+ default y if ARCH_ARM_AT91SAM926X
default y if ARCH_ARM_EPXA
default y if ARCH_ARM_IMX
default y if ARCH_ARM_NETARM
Index: ptxdist-trunk/rules/ffmpeg.make
===================================================================
--- ptxdist-trunk.orig/rules/ffmpeg.make 2008-08-05 22:45:01.000000000
+0200
+++ ptxdist-trunk/rules/ffmpeg.make 2008-08-05 22:51:01.000000000 +0200
@@ -154,15 +154,7 @@ ifdef PTXCONF_ARCH_ARM
--disable-altivec \
--disable-mmx
else
- ifdef PTXCONF_ARCH_ARM_AT91SAM9260
- FFMPEG_AUTOCONF += \
- --arch=arm \
- --cpu=arm926ej-s \
- --disable-altivec \
- --disable-mmx \
- --disable-iwmmxt
- else
- ifdef PTXCONF_ARCH_ARM_AT91SAM9263
+ ifdef PTXCONF_ARCH_ARM_AT91SAM926X
FFMPEG_AUTOCONF += \
--arch=arm \
--cpu=arm926ej-s \
@@ -183,7 +175,6 @@ ifdef PTXCONF_ARCH_ARM
endif
endif
endif
- endif
endif
ifdef PTXCONF_ARCH_PPC
--
--
ptxdist mailing list
[email protected]
