[Armadeus-commitlog] SF.net SVN: armadeus:[1339] trunk/buildroot
Brought to you by:
sszy
Menu
▾
▴
[Armadeus-commitlog] SF.net SVN: armadeus:[1339] trunk/buildroot
|
From: <ar...@us...> - 2009-06-08 17:29:26
|
Revision: 1339
http://armadeus.svn.sourceforge.net/armadeus/?rev=1339&view=rev
Author: artemys
Date: 2009-06-08 17:28:39 +0000 (Mon, 08 Jun 2009)
Log Message:
-----------
[LINUX] Adds a Linux config to say if APF9328 has a FPGA or not + remove an unneeded one
Modified Paths:
--------------
trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
Modified: trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config
===================================================================
--- trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config 2009-06-08 16:05:43 UTC (rev 1338)
+++ trunk/buildroot/local/apf9328_test/linux-2.6.29.4.config 2009-06-08 17:28:39 UTC (rev 1339)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
# Linux kernel version: 2.6.29.4
-# Thu Jun 4 08:59:34 2009
+# Mon Jun 8 18:45:14 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,10 +166,9 @@
#
# CONFIG_ARCH_MX1ADS is not set
CONFIG_MACH_APF9328=y
+CONFIG_MACH_APF9328_FPGA=y
# CONFIG_IMX_APF9328_FLASH_8MB is not set
CONFIG_IMX_APF9328_FLASH_16MB=y
-CONFIG_IMX_SCB9328_RAM_16MB=y
-# CONFIG_IMX_SCB9328_RAM_32MB is not set
#
# Processor Type
Modified: trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config
===================================================================
--- trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config 2009-06-08 16:05:43 UTC (rev 1338)
+++ trunk/buildroot/target/device/armadeus/apf9328/apf9328-linux-2.6.29.config 2009-06-08 17:28:39 UTC (rev 1339)
@@ -1,7 +1,7 @@
#
# Automatically generated make config: don't edit
-# Linux kernel version: 2.6.29
-# Mon May 18 13:20:04 2009
+# Linux kernel version: 2.6.29.4
+# Mon Jun 8 18:45:14 2009
#
CONFIG_ARM=y
CONFIG_SYS_SUPPORTS_APM_EMULATION=y
@@ -166,10 +166,9 @@
#
# CONFIG_ARCH_MX1ADS is not set
CONFIG_MACH_APF9328=y
+CONFIG_MACH_APF9328_FPGA=y
# CONFIG_IMX_APF9328_FLASH_8MB is not set
CONFIG_IMX_APF9328_FLASH_16MB=y
-CONFIG_IMX_SCB9328_RAM_16MB=y
-# CONFIG_IMX_SCB9328_RAM_32MB is not set
#
# Processor Type
Modified: trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch
===================================================================
--- trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-08 16:05:43 UTC (rev 1338)
+++ trunk/buildroot/target/device/armadeus/linux/kernel-patches/2.6.29/024-armadeus-apf9328-add_board_to_linux_build_system.patch 2009-06-08 17:28:39 UTC (rev 1339)
@@ -1,7 +1,7 @@
Index: linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h
===================================================================
--- linux-2.6.29.4.orig/arch/arm/mach-imx/include/mach/hardware.h 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-06-04 10:05:01.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/include/mach/hardware.h 2009-06-08 18:45:55.000000000 +0200
@@ -88,4 +88,8 @@
#include "mx1ads.h"
#endif
@@ -14,7 +14,7 @@
Index: linux-2.6.29.4/arch/arm/mach-imx/Kconfig
===================================================================
--- linux-2.6.29.4.orig/arch/arm/mach-imx/Kconfig 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-06-04 09:54:16.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Kconfig 2009-06-08 18:46:34.000000000 +0200
@@ -1,6 +1,10 @@
menu "IMX Implementations"
depends on ARCH_IMX
@@ -26,18 +26,24 @@
config ARCH_MX1ADS
bool "mx1ads"
depends on ARCH_IMX
-@@ -8,4 +12,38 @@
+@@ -8,4 +12,31 @@
help
Say Y here if you are using the Motorola MX1ADS board
+config MACH_APF9328
-+ bool "apf9328"
-+ depends on ARCH_IMX
-+ help
-+ Say Yes here if you are using the Armadeus APF9328 development board
++ bool "APF9328"
++ depends on ARCH_IMX
++ help
++ Say Yes here if you are using the Armadeus APF9328 development board
+
+endchoice
+
++config MACH_APF9328_FPGA
++ bool "board has a FPGA"
++ depends on MACH_APF9328
++ help
++ Select this if your APF9328 has an onboard FPGA
++
+choice
+ prompt "APF9328 Flash available"
+ depends on MACH_APF9328
@@ -51,24 +57,11 @@
+
+endchoice
+
-+choice
-+ prompt "APF9328 RAM available"
-+ depends on MACH_APF9328
-+ default IMX_APF9328_RAM_32MB
-+
-+config IMX_SCB9328_RAM_16MB
-+ bool "16MB"
-+
-+config IMX_SCB9328_RAM_32MB
-+ bool "32MB"
-+
-+endchoice
-+
endmenu
Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile
===================================================================
--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-06-04 09:54:16.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile 2009-06-08 18:35:27.000000000 +0200
@@ -10,6 +10,7 @@
# Specific board support
@@ -80,7 +73,7 @@
Index: linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot
===================================================================
--- linux-2.6.29.4.orig/arch/arm/mach-imx/Makefile.boot 2009-03-24 00:12:14.000000000 +0100
-+++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-06-04 09:54:16.000000000 +0200
++++ linux-2.6.29.4/arch/arm/mach-imx/Makefile.boot 2009-06-08 18:35:27.000000000 +0200
@@ -1,2 +1,3 @@
zreladdr-$(CONFIG_ARCH_MX1ADS) := 0x08008000
+ zreladdr-$(CONFIG_MACH_APF9328) := 0x08008000
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
