mirror of https://github.com/hak5/openwrt.git
Prepare etrax for kernel update and update kernel configure for 2.6.25
SVN-Revision: 14406lede-17.01
Claudio Mignanti
parent
b4e41b6ac2
commit
0bfeb7caa3
|
|
@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
|
||||||
ARCH:=cris
|
ARCH:=cris
|
||||||
BOARD:=etrax
|
BOARD:=etrax
|
||||||
BOARDNAME:=Foxboard (ETRAX 100LX)
|
BOARDNAME:=Foxboard (ETRAX 100LX)
|
||||||
FEATURES:=squashfs jffs2 broken
|
FEATURES:=squashfs jffs2
|
||||||
LINUX_VERSION:=2.6.25.20
|
LINUX_VERSION:=2.6.25.20
|
||||||
|
|
||||||
include $(INCLUDE_DIR)/target.mk
|
include $(INCLUDE_DIR)/target.mk
|
||||||
|
|
|
||||||
|
|
@ -0,0 +1,284 @@
|
||||||
|
# CONFIG_ARCH_HAS_ILOG2_U32 is not set
|
||||||
|
# CONFIG_ARCH_HAS_ILOG2_U64 is not set
|
||||||
|
CONFIG_BASE_SMALL=0
|
||||||
|
CONFIG_BITREVERSE=y
|
||||||
|
# CONFIG_BLK_DEV_LOOP is not set
|
||||||
|
# CONFIG_BLK_DEV_NBD is not set
|
||||||
|
CONFIG_BLK_DEV_SD=y
|
||||||
|
# CONFIG_BONDING is not set
|
||||||
|
CONFIG_BOUNCE=y
|
||||||
|
CONFIG_BRIDGE=m
|
||||||
|
# CONFIG_BT is not set
|
||||||
|
# CONFIG_CIFS is not set
|
||||||
|
CONFIG_CLASSIC_RCU=y
|
||||||
|
CONFIG_CRIS=y
|
||||||
|
# CONFIG_CRIS_MACH_ARTPEC3 is not set
|
||||||
|
CONFIG_CRYPTO_AEAD=m
|
||||||
|
# CONFIG_CRYPTO_ANUBIS is not set
|
||||||
|
CONFIG_CRYPTO_AUTHENC=m
|
||||||
|
# CONFIG_CRYPTO_BLOWFISH is not set
|
||||||
|
# CONFIG_CRYPTO_CAMELLIA is not set
|
||||||
|
# CONFIG_CRYPTO_CAST5 is not set
|
||||||
|
# CONFIG_CRYPTO_CAST6 is not set
|
||||||
|
# CONFIG_CRYPTO_CCM is not set
|
||||||
|
# CONFIG_CRYPTO_CRC32C is not set
|
||||||
|
# CONFIG_CRYPTO_CTR is not set
|
||||||
|
# CONFIG_CRYPTO_GCM is not set
|
||||||
|
# CONFIG_CRYPTO_KHAZAD is not set
|
||||||
|
# CONFIG_CRYPTO_LZO is not set
|
||||||
|
# CONFIG_CRYPTO_MD4 is not set
|
||||||
|
# CONFIG_CRYPTO_NULL is not set
|
||||||
|
# CONFIG_CRYPTO_SALSA20 is not set
|
||||||
|
# CONFIG_CRYPTO_SEQIV is not set
|
||||||
|
# CONFIG_CRYPTO_SERPENT is not set
|
||||||
|
# CONFIG_CRYPTO_SHA256 is not set
|
||||||
|
# CONFIG_CRYPTO_SHA512 is not set
|
||||||
|
# CONFIG_CRYPTO_TEA is not set
|
||||||
|
# CONFIG_CRYPTO_TEST is not set
|
||||||
|
# CONFIG_CRYPTO_TGR192 is not set
|
||||||
|
# CONFIG_CRYPTO_TWOFISH is not set
|
||||||
|
# CONFIG_CRYPTO_WP512 is not set
|
||||||
|
# CONFIG_ETRAX100LX is not set
|
||||||
|
CONFIG_ETRAX100LX_V2=y
|
||||||
|
# CONFIG_ETRAXFS is not set
|
||||||
|
CONFIG_ETRAX_ARCH_V10=y
|
||||||
|
# CONFIG_ETRAX_ARCH_V32 is not set
|
||||||
|
CONFIG_ETRAX_AXISFLASHMAP=y
|
||||||
|
CONFIG_ETRAX_CMDLINE="root=/dev/mtdblock1 rootfstype=squashfs,jffs2 init=/etc/preinit noinitrd console=ttyS0,115200"
|
||||||
|
# CONFIG_ETRAX_CSP0_LEDS is not set
|
||||||
|
# CONFIG_ETRAX_DEBUG_PORT0 is not set
|
||||||
|
# CONFIG_ETRAX_DEBUG_PORT1 is not set
|
||||||
|
# CONFIG_ETRAX_DEBUG_PORT2 is not set
|
||||||
|
# CONFIG_ETRAX_DEBUG_PORT3 is not set
|
||||||
|
CONFIG_ETRAX_DEBUG_PORT_NULL=y
|
||||||
|
CONFIG_ETRAX_DEF_R_BUS_CONFIG=0x4
|
||||||
|
CONFIG_ETRAX_DEF_R_PORT_PA_DATA=0xf0
|
||||||
|
CONFIG_ETRAX_DEF_R_PORT_PA_DIR=0x1c
|
||||||
|
CONFIG_ETRAX_DEF_R_PORT_PB_CONFIG=0x00
|
||||||
|
CONFIG_ETRAX_DEF_R_PORT_PB_DATA=0x03
|
||||||
|
CONFIG_ETRAX_DEF_R_PORT_PB_DIR=0xce
|
||||||
|
CONFIG_ETRAX_DEF_R_SDRAM_CONFIG=0x09603737
|
||||||
|
CONFIG_ETRAX_DEF_R_SDRAM_TIMING=0x80008002
|
||||||
|
CONFIG_ETRAX_DEF_R_WAITSTATES=0x95f8
|
||||||
|
CONFIG_ETRAX_DRAM_SIZE=32
|
||||||
|
CONFIG_ETRAX_DRAM_VIRTUAL_BASE=c0000000
|
||||||
|
CONFIG_ETRAX_ETHERNET=y
|
||||||
|
CONFIG_ETRAX_FAST_TIMER=y
|
||||||
|
CONFIG_ETRAX_FLASH1_SIZE=0
|
||||||
|
CONFIG_ETRAX_FLASH_BUSWIDTH=2
|
||||||
|
CONFIG_ETRAX_GPIO=y
|
||||||
|
# CONFIG_ETRAX_I2C is not set
|
||||||
|
# CONFIG_ETRAX_KMALLOCED_MODULES is not set
|
||||||
|
CONFIG_ETRAX_LED1G=2
|
||||||
|
CONFIG_ETRAX_LED1R=2
|
||||||
|
CONFIG_ETRAX_LED2G=3
|
||||||
|
CONFIG_ETRAX_LED2R=3
|
||||||
|
CONFIG_ETRAX_LED3G=2
|
||||||
|
CONFIG_ETRAX_LED3R=2
|
||||||
|
CONFIG_ETRAX_NANDFLASH_BUSWIDTH=1
|
||||||
|
CONFIG_ETRAX_NETWORK_LED_ON_WHEN_ACTIVITY=y
|
||||||
|
# CONFIG_ETRAX_NETWORK_LED_ON_WHEN_LINK is not set
|
||||||
|
# CONFIG_ETRAX_NO_LEDS is not set
|
||||||
|
CONFIG_ETRAX_PA_BUTTON_BITMASK=02
|
||||||
|
CONFIG_ETRAX_PA_CHANGEABLE_BITS=0xFF
|
||||||
|
CONFIG_ETRAX_PA_CHANGEABLE_DIR=0xFF
|
||||||
|
CONFIG_ETRAX_PA_LEDS=y
|
||||||
|
CONFIG_ETRAX_PB_CHANGEABLE_BITS=0xFF
|
||||||
|
CONFIG_ETRAX_PB_CHANGEABLE_DIR=0xFF
|
||||||
|
# CONFIG_ETRAX_PB_LEDS is not set
|
||||||
|
CONFIG_ETRAX_PTABLE_SECTOR=0
|
||||||
|
CONFIG_ETRAX_RESCUE_SER0=y
|
||||||
|
# CONFIG_ETRAX_RESCUE_SER1 is not set
|
||||||
|
# CONFIG_ETRAX_RESCUE_SER2 is not set
|
||||||
|
# CONFIG_ETRAX_RESCUE_SER3 is not set
|
||||||
|
# CONFIG_ETRAX_RS485 is not set
|
||||||
|
CONFIG_ETRAX_SDRAM=y
|
||||||
|
CONFIG_ETRAX_SER0_CD_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_CD_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_DSR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_DSR_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_DTR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_DTR_ON_PB_BIT=-1
|
||||||
|
# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_MIXED is not set
|
||||||
|
CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_NONE=y
|
||||||
|
# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PA is not set
|
||||||
|
# CONFIG_ETRAX_SER0_DTR_RI_DSR_CD_ON_PB is not set
|
||||||
|
CONFIG_ETRAX_SER0_RI_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER0_RI_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_CD_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_CD_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_DSR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_DSR_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_DTR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_DTR_ON_PB_BIT=-1
|
||||||
|
# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_MIXED is not set
|
||||||
|
CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_NONE=y
|
||||||
|
# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PA is not set
|
||||||
|
# CONFIG_ETRAX_SER2_DTR_RI_DSR_CD_ON_PB is not set
|
||||||
|
CONFIG_ETRAX_SER2_RI_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER2_RI_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_CD_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_CD_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_DSR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_DSR_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_DTR_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_DTR_ON_PB_BIT=-1
|
||||||
|
# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_MIXED is not set
|
||||||
|
CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_NONE=y
|
||||||
|
# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PA is not set
|
||||||
|
# CONFIG_ETRAX_SER3_DTR_RI_DSR_CD_ON_PB is not set
|
||||||
|
CONFIG_ETRAX_SER3_RI_ON_PA_BIT=-1
|
||||||
|
CONFIG_ETRAX_SER3_RI_ON_PB_BIT=-1
|
||||||
|
CONFIG_ETRAX_SERIAL=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_FAST_TIMER is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_FLUSH_DMA_FAST is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT0=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT0_DMA0_OUT is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT0_DMA1_IN is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT0_DMA6_OUT is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT0_DMA7_IN is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_IN=y
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT0_NO_DMA_OUT=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT1 is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT2=y
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT2_DMA2_OUT=y
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT2_DMA3_IN=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT2_DMA6_OUT is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT2_DMA7_IN is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_IN is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT2_NO_DMA_OUT is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT3=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_DMA2_OUT is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_DMA3_IN is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT3_DMA4_OUT=y
|
||||||
|
CONFIG_ETRAX_SERIAL_PORT3_DMA5_IN=y
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_DMA8_OUT is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_DMA9_IN is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_IN is not set
|
||||||
|
# CONFIG_ETRAX_SERIAL_PORT3_NO_DMA_OUT is not set
|
||||||
|
CONFIG_ETRAX_SERIAL_RX_TIMEOUT_TICKS=1
|
||||||
|
# CONFIG_ETRAX_SOFT_SHUTDOWN is not set
|
||||||
|
# CONFIG_ETRAX_SYNCHRONOUS_SERIAL is not set
|
||||||
|
CONFIG_ETRAX_USB_HOST=y
|
||||||
|
CONFIG_ETRAX_USB_HOST_PORT1=y
|
||||||
|
CONFIG_ETRAX_USB_HOST_PORT2=y
|
||||||
|
# CONFIG_ETRAX_VCS_SIM is not set
|
||||||
|
# CONFIG_ETRAX_WATCHDOG is not set
|
||||||
|
CONFIG_EXT2_FS=y
|
||||||
|
# CONFIG_EXT3_FS is not set
|
||||||
|
CONFIG_FORCE_MAX_ZONEORDER=6
|
||||||
|
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||||
|
CONFIG_GENERIC_IOMAP=y
|
||||||
|
# CONFIG_GEN_RTC is not set
|
||||||
|
# CONFIG_HAMRADIO is not set
|
||||||
|
CONFIG_HAS_DMA=y
|
||||||
|
CONFIG_HAS_IOMEM=y
|
||||||
|
CONFIG_HAVE_IDE=y
|
||||||
|
# CONFIG_HAVE_KPROBES is not set
|
||||||
|
# CONFIG_HAVE_KRETPROBES is not set
|
||||||
|
# CONFIG_HAVE_OPROFILE is not set
|
||||||
|
# CONFIG_HFSPLUS_FS is not set
|
||||||
|
# CONFIG_HFS_FS is not set
|
||||||
|
# CONFIG_HW_RANDOM is not set
|
||||||
|
# CONFIG_I2C is not set
|
||||||
|
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
|
||||||
|
# CONFIG_IBM_NEW_EMAC_RGMII is not set
|
||||||
|
# CONFIG_IBM_NEW_EMAC_TAH is not set
|
||||||
|
# CONFIG_IBM_NEW_EMAC_ZMII is not set
|
||||||
|
# CONFIG_IDE is not set
|
||||||
|
# CONFIG_IEEE80211 is not set
|
||||||
|
# CONFIG_IFB is not set
|
||||||
|
# CONFIG_IMQ is not set
|
||||||
|
CONFIG_INITRAMFS_SOURCE=""
|
||||||
|
# CONFIG_ISO9660_FS is not set
|
||||||
|
CONFIG_LLC=m
|
||||||
|
# CONFIG_MINIX_FS is not set
|
||||||
|
# CONFIG_MSDOS_FS is not set
|
||||||
|
CONFIG_MTD=y
|
||||||
|
CONFIG_MTDRAM_ABS_POS=0x0
|
||||||
|
CONFIG_MTDRAM_ERASE_SIZE=128
|
||||||
|
CONFIG_MTDRAM_TOTAL_SIZE=0
|
||||||
|
# CONFIG_MTD_ABSENT is not set
|
||||||
|
CONFIG_MTD_BLKDEVS=y
|
||||||
|
CONFIG_MTD_BLOCK=y
|
||||||
|
# CONFIG_MTD_BLOCK2MTD is not set
|
||||||
|
CONFIG_MTD_CFI=y
|
||||||
|
CONFIG_MTD_CFI_ADV_OPTIONS=y
|
||||||
|
CONFIG_MTD_CFI_AMDSTD=y
|
||||||
|
# CONFIG_MTD_CFI_BE_BYTE_SWAP is not set
|
||||||
|
# CONFIG_MTD_CFI_GEOMETRY is not set
|
||||||
|
CONFIG_MTD_CFI_I1=y
|
||||||
|
CONFIG_MTD_CFI_I2=y
|
||||||
|
# CONFIG_MTD_CFI_I4 is not set
|
||||||
|
# CONFIG_MTD_CFI_I8 is not set
|
||||||
|
# CONFIG_MTD_CFI_INTELEXT is not set
|
||||||
|
# CONFIG_MTD_CFI_LE_BYTE_SWAP is not set
|
||||||
|
CONFIG_MTD_CFI_NOSWAP=y
|
||||||
|
# CONFIG_MTD_CFI_STAA is not set
|
||||||
|
CONFIG_MTD_CFI_UTIL=y
|
||||||
|
CONFIG_MTD_CHAR=y
|
||||||
|
# CONFIG_MTD_CMDLINE_PARTS is not set
|
||||||
|
CONFIG_MTD_COMPLEX_MAPPINGS=y
|
||||||
|
CONFIG_MTD_CONCAT=y
|
||||||
|
# CONFIG_MTD_DEBUG is not set
|
||||||
|
# CONFIG_MTD_DOC2000 is not set
|
||||||
|
# CONFIG_MTD_DOC2001 is not set
|
||||||
|
# CONFIG_MTD_DOC2001PLUS is not set
|
||||||
|
CONFIG_MTD_GEN_PROBE=y
|
||||||
|
CONFIG_MTD_JEDECPROBE=y
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_2=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
|
||||||
|
CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
||||||
|
# CONFIG_MTD_MAP_BANK_WIDTH_8 is not set
|
||||||
|
CONFIG_MTD_MTDRAM=y
|
||||||
|
# CONFIG_MTD_ONENAND is not set
|
||||||
|
# CONFIG_MTD_OTP is not set
|
||||||
|
CONFIG_MTD_PARTITIONS=y
|
||||||
|
# CONFIG_MTD_PHRAM is not set
|
||||||
|
# CONFIG_MTD_PHYSMAP is not set
|
||||||
|
# CONFIG_MTD_PLATRAM is not set
|
||||||
|
# CONFIG_MTD_RAM is not set
|
||||||
|
# CONFIG_MTD_REDBOOT_PARTS is not set
|
||||||
|
# CONFIG_MTD_ROM is not set
|
||||||
|
# CONFIG_MTD_SLRAM is not set
|
||||||
|
# CONFIG_NETDEV_1000 is not set
|
||||||
|
# CONFIG_NFSD is not set
|
||||||
|
# CONFIG_NFS_FS is not set
|
||||||
|
CONFIG_NLS=y
|
||||||
|
CONFIG_NLS_CODEPAGE_437=y
|
||||||
|
CONFIG_NLS_ISO8859_1=y
|
||||||
|
CONFIG_NO_IOPORT=y
|
||||||
|
# CONFIG_OOM_REBOOT is not set
|
||||||
|
# CONFIG_PPP is not set
|
||||||
|
# CONFIG_RTC is not set
|
||||||
|
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||||
|
CONFIG_SCSI=y
|
||||||
|
# CONFIG_SCSI_LOWLEVEL_PCMCIA is not set
|
||||||
|
CONFIG_SCSI_WAIT_SCAN=m
|
||||||
|
# CONFIG_SERIAL_8250 is not set
|
||||||
|
CONFIG_SLABINFO=y
|
||||||
|
# CONFIG_SPARSEMEM_STATIC is not set
|
||||||
|
# CONFIG_SPARSEMEM_VMEMMAP_ENABLE is not set
|
||||||
|
# CONFIG_SVINTO_SIM is not set
|
||||||
|
# CONFIG_SYSTEM_PROFILER is not set
|
||||||
|
CONFIG_SYSVIPC_SYSCTL=y
|
||||||
|
# CONFIG_TUN is not set
|
||||||
|
# CONFIG_UDF_FS is not set
|
||||||
|
CONFIG_UID16=y
|
||||||
|
CONFIG_USB=y
|
||||||
|
# CONFIG_USB_ACM is not set
|
||||||
|
# CONFIG_USB_ARCH_HAS_EHCI is not set
|
||||||
|
# CONFIG_USB_ARCH_HAS_HCD is not set
|
||||||
|
# CONFIG_USB_ARCH_HAS_OHCI is not set
|
||||||
|
# CONFIG_USB_PRINTER is not set
|
||||||
|
# CONFIG_USB_R8A66597_HCD is not set
|
||||||
|
# CONFIG_USB_SERIAL is not set
|
||||||
|
CONFIG_USB_STORAGE=y
|
||||||
|
CONFIG_USB_SUPPORT=y
|
||||||
|
# CONFIG_VFAT_FS is not set
|
||||||
|
CONFIG_VIDEO_V4L2_COMMON=m
|
||||||
|
# CONFIG_VLAN_8021Q is not set
|
||||||
|
# CONFIG_WLAN_80211 is not set
|
||||||
|
# CONFIG_XFS_FS is not set
|
||||||
|
|
@ -0,0 +1,74 @@
|
||||||
|
Index: linux-2.6.25.16/arch/cris/arch-v10/drivers/ds1302.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.25.16.o/arch/cris/arch-v10/drivers/ds1302.c 2008-10-26 15:54:02.000000000 +0100
|
||||||
|
+++ linux-2.6.25.16/arch/cris/arch-v10/drivers/ds1302.c 2008-10-26 15:59:37.000000000 +0100
|
||||||
|
@@ -21,6 +21,7 @@
|
||||||
|
#include <linux/delay.h>
|
||||||
|
#include <linux/bcd.h>
|
||||||
|
#include <linux/capability.h>
|
||||||
|
+#include <linux/device.h>
|
||||||
|
|
||||||
|
#include <asm/uaccess.h>
|
||||||
|
#include <asm/system.h>
|
||||||
|
@@ -489,6 +490,10 @@
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SYSFS
|
||||||
|
+static struct class *rtc_class;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static int __init ds1302_register(void)
|
||||||
|
{
|
||||||
|
ds1302_init();
|
||||||
|
@@ -497,6 +502,12 @@
|
||||||
|
ds1302_name, RTC_MAJOR_NR);
|
||||||
|
return -1;
|
||||||
|
}
|
||||||
|
+ #ifdef CONFIG_SYSFS
|
||||||
|
+ rtc_class = class_create(THIS_MODULE, "rtc");
|
||||||
|
+ class_device_create(rtc_class, NULL, MKDEV(RTC_MAJOR_NR, 0),
|
||||||
|
+ NULL, "rtc");
|
||||||
|
+ #endif
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
|
||||||
|
}
|
||||||
|
Index: linux-2.6.25.16/arch/cris/arch-v10/drivers/gpio.c
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.25.16.o/arch/cris/arch-v10/drivers/gpio.c 2008-10-26 15:56:28.000000000 +0100
|
||||||
|
+++ linux-2.6.25.16/arch/cris/arch-v10/drivers/gpio.c 2008-10-26 15:57:41.000000000 +0100
|
||||||
|
@@ -20,6 +20,7 @@
|
||||||
|
#include <linux/poll.h>
|
||||||
|
#include <linux/init.h>
|
||||||
|
#include <linux/interrupt.h>
|
||||||
|
+#include <linux/device.h>
|
||||||
|
|
||||||
|
#include <asm/etraxgpio.h>
|
||||||
|
#include <asm/arch/svinto.h>
|
||||||
|
@@ -768,6 +769,10 @@
|
||||||
|
|
||||||
|
/* main driver initialization routine, called from mem.c */
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SYSFS
|
||||||
|
+static struct class *gpio_class;
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
static int __init gpio_init(void)
|
||||||
|
{
|
||||||
|
int res;
|
||||||
|
@@ -781,6 +786,13 @@
|
||||||
|
return res;
|
||||||
|
}
|
||||||
|
|
||||||
|
+#ifdef CONFIG_SYSFS
|
||||||
|
+ gpio_class = class_create(THIS_MODULE, "gpio");
|
||||||
|
+ class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 0), NULL, "gpioa");
|
||||||
|
+ class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 1), NULL, "gpiob");
|
||||||
|
+ class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 2), NULL, "leds");
|
||||||
|
+ class_device_create(gpio_class, NULL, MKDEV(GPIO_MAJOR, 3), NULL, "gpiog");
|
||||||
|
+#endif
|
||||||
|
/* Clear all leds */
|
||||||
|
#if defined (CONFIG_ETRAX_CSP0_LEDS) || defined (CONFIG_ETRAX_PA_LEDS) || defined (CONFIG_ETRAX_PB_LEDS)
|
||||||
|
CRIS_LED_NETWORK_SET(0);
|
||||||
|
|
||||||
|
|
@ -0,0 +1,302 @@
|
||||||
|
--- a/arch/cris/Makefile
|
||||||
|
+++ b/arch/cris/Makefile
|
||||||
|
@@ -33,7 +33,7 @@ endif
|
||||||
|
|
||||||
|
LD = $(CROSS_COMPILE)ld -mcrislinux
|
||||||
|
|
||||||
|
-OBJCOPYFLAGS := -O binary -R .note -R .comment -S
|
||||||
|
+OBJCOPYFLAGS := -O binary -R .bss -R .note -R .note.gnu.build-id -R .comment -S
|
||||||
|
|
||||||
|
CPPFLAGS_vmlinux.lds = -DDRAM_VIRTUAL_BASE=0x$(CONFIG_ETRAX_DRAM_VIRTUAL_BASE)
|
||||||
|
|
||||||
|
--- a/arch/cris/arch-v10/boot/Makefile
|
||||||
|
+++ b/arch/cris/arch-v10/boot/Makefile
|
||||||
|
@@ -2,9 +2,6 @@
|
||||||
|
# arch/cris/arch-v10/boot/Makefile
|
||||||
|
#
|
||||||
|
|
||||||
|
-OBJCOPY = objcopy-cris
|
||||||
|
-OBJCOPYFLAGS = -O binary --remove-section=.bss
|
||||||
|
-
|
||||||
|
subdir- := compressed rescue
|
||||||
|
targets := Image
|
||||||
|
|
||||||
|
@@ -14,7 +11,6 @@ $(obj)/Image: vmlinux FORCE
|
||||||
|
|
||||||
|
$(obj)/compressed/vmlinux: $(obj)/Image FORCE
|
||||||
|
$(Q)$(MAKE) $(build)=$(obj)/compressed $@
|
||||||
|
- $(Q)$(MAKE) $(build)=$(obj)/rescue $(obj)/rescue/rescue.bin
|
||||||
|
|
||||||
|
$(obj)/zImage: $(obj)/compressed/vmlinux
|
||||||
|
@cp $< $@
|
||||||
|
--- a/arch/cris/arch-v10/boot/compressed/Makefile
|
||||||
|
+++ b/arch/cris/arch-v10/boot/compressed/Makefile
|
||||||
|
@@ -2,13 +2,9 @@
|
||||||
|
# arch/cris/arch-v10/boot/compressed/Makefile
|
||||||
|
#
|
||||||
|
|
||||||
|
-CC = gcc-cris -melf $(LINUXINCLUDE)
|
||||||
|
ccflags-y += -O2
|
||||||
|
-LD = ld-cris
|
||||||
|
ldflags-y += -T $(obj)/decompress.ld
|
||||||
|
OBJECTS = $(obj)/head.o $(obj)/misc.o
|
||||||
|
-OBJCOPY = objcopy-cris
|
||||||
|
-OBJCOPYFLAGS = -O binary --remove-section=.bss
|
||||||
|
|
||||||
|
quiet_cmd_image = BUILD $@
|
||||||
|
cmd_image = cat $(obj)/decompress.bin $(obj)/piggy.gz > $@
|
||||||
|
@@ -21,12 +17,6 @@
|
||||||
|
$(obj)/decompress.bin: $(obj)/decompress.o FORCE
|
||||||
|
$(call if_changed,objcopy)
|
||||||
|
|
||||||
|
-$(obj)/head.o: $(obj)/head.S .config
|
||||||
|
- @$(CC) -D__ASSEMBLY__ -traditional -c $< -o $@
|
||||||
|
-
|
||||||
|
-$(obj)/misc.o: $(obj)/misc.c .config
|
||||||
|
- @$(CC) -D__KERNEL__ -c $< -o $@
|
||||||
|
-
|
||||||
|
$(obj)/vmlinux: $(obj)/piggy.gz $(obj)/decompress.bin FORCE
|
||||||
|
$(call if_changed,image)
|
||||||
|
|
||||||
|
--- a/arch/cris/arch-v10/boot/compressed/decompress.ld
|
||||||
|
+++ b/arch/cris/arch-v10/boot/compressed/decompress.ld
|
||||||
|
@@ -1,4 +1,4 @@
|
||||||
|
-OUTPUT_FORMAT(elf32-us-cris)
|
||||||
|
+OUTPUT_FORMAT(elf32-cris)
|
||||||
|
|
||||||
|
MEMORY
|
||||||
|
{
|
||||||
|
--- a/arch/cris/arch-v10/boot/compressed/head.S
|
||||||
|
+++ b/arch/cris/arch-v10/boot/compressed/head.S
|
||||||
|
@@ -10,13 +10,14 @@
|
||||||
|
|
||||||
|
#define ASSEMBLER_MACROS_ONLY
|
||||||
|
#include <asm/arch/sv_addr_ag.h>
|
||||||
|
+#include <linux/autoconf.h>
|
||||||
|
|
||||||
|
#define RAM_INIT_MAGIC 0x56902387
|
||||||
|
#define COMMAND_LINE_MAGIC 0x87109563
|
||||||
|
|
||||||
|
;; Exported symbols
|
||||||
|
|
||||||
|
- .globl _input_data
|
||||||
|
+ .globl input_data
|
||||||
|
|
||||||
|
|
||||||
|
.text
|
||||||
|
@@ -26,7 +27,7 @@
|
||||||
|
|
||||||
|
;; We need to initialze DRAM registers before we start using the DRAM
|
||||||
|
|
||||||
|
- cmp.d RAM_INIT_MAGIC, r8 ; Already initialized?
|
||||||
|
+ cmp.d RAM_INIT_MAGIC, $r8 ; Already initialized?
|
||||||
|
beq dram_init_finished
|
||||||
|
nop
|
||||||
|
|
||||||
|
@@ -36,91 +37,91 @@ dram_init_finished:
|
||||||
|
|
||||||
|
;; Initiate the PA and PB ports
|
||||||
|
|
||||||
|
- move.b CONFIG_ETRAX_DEF_R_PORT_PA_DATA, r0
|
||||||
|
- move.b r0, [R_PORT_PA_DATA]
|
||||||
|
+ move.b CONFIG_ETRAX_DEF_R_PORT_PA_DATA, $r0
|
||||||
|
+ move.b $r0, [R_PORT_PA_DATA]
|
||||||
|
|
||||||
|
- move.b CONFIG_ETRAX_DEF_R_PORT_PA_DIR, r0
|
||||||
|
- move.b r0, [R_PORT_PA_DIR]
|
||||||
|
+ move.b CONFIG_ETRAX_DEF_R_PORT_PA_DIR, $r0
|
||||||
|
+ move.b $r0, [R_PORT_PA_DIR]
|
||||||
|
|
||||||
|
- move.b CONFIG_ETRAX_DEF_R_PORT_PB_DATA, r0
|
||||||
|
- move.b r0, [R_PORT_PB_DATA]
|
||||||
|
+ move.b CONFIG_ETRAX_DEF_R_PORT_PB_DATA, $r0
|
||||||
|
+ move.b $r0, [R_PORT_PB_DATA]
|
||||||
|
|
||||||
|
- move.b CONFIG_ETRAX_DEF_R_PORT_PB_DIR, r0
|
||||||
|
- move.b r0, [R_PORT_PB_DIR]
|
||||||
|
+ move.b CONFIG_ETRAX_DEF_R_PORT_PB_DIR, $r0
|
||||||
|
+ move.b $r0, [R_PORT_PB_DIR]
|
||||||
|
|
||||||
|
;; Setup the stack to a suitably high address.
|
||||||
|
;; We assume 8 MB is the minimum DRAM in an eLinux
|
||||||
|
;; product and put the sp at the top for now.
|
||||||
|
|
||||||
|
- move.d 0x40800000, sp
|
||||||
|
+ move.d 0x40800000, $sp
|
||||||
|
|
||||||
|
;; Figure out where the compressed piggyback image is
|
||||||
|
;; in the flash (since we wont try to copy it to DRAM
|
||||||
|
;; before unpacking). It is at _edata, but in flash.
|
||||||
|
;; Use (_edata - basse) as offset to the current PC.
|
||||||
|
|
||||||
|
-basse: move.d pc, r5
|
||||||
|
- and.d 0x7fffffff, r5 ; strip any non-cache bit
|
||||||
|
- subq 2, r5 ; compensate for the move.d pc instr
|
||||||
|
- move.d r5, r0 ; save for later - flash address of 'basse'
|
||||||
|
- add.d _edata, r5
|
||||||
|
- sub.d basse, r5 ; r5 = flash address of '_edata'
|
||||||
|
+basse: move.d $pc, $r5
|
||||||
|
+ and.d 0x7fffffff, $r5 ; strip any non-cache bit
|
||||||
|
+ subq 2, $r5 ; compensate for the move.d pc instr
|
||||||
|
+ move.d $r5, $r0 ; save for later - flash address of 'basse'
|
||||||
|
+ add.d _edata, $r5
|
||||||
|
+ sub.d basse, $r5 ; r5 = flash address of '_edata'
|
||||||
|
|
||||||
|
;; Copy text+data to DRAM
|
||||||
|
|
||||||
|
- move.d basse, r1 ; destination
|
||||||
|
- move.d _edata, r2 ; end destination
|
||||||
|
-1: move.w [r0+], r3
|
||||||
|
- move.w r3, [r1+]
|
||||||
|
- cmp.d r2, r1
|
||||||
|
+ move.d basse, $r1 ; destination
|
||||||
|
+ move.d _edata, $r2 ; end destination
|
||||||
|
+1: move.w [$r0+], $r3
|
||||||
|
+ move.w $r3, [$r1+]
|
||||||
|
+ cmp.d $r2, $r1
|
||||||
|
bcs 1b
|
||||||
|
nop
|
||||||
|
|
||||||
|
- move.d r5, [_input_data] ; for the decompressor
|
||||||
|
+ move.d $r5, [input_data] ; for the decompressor
|
||||||
|
|
||||||
|
|
||||||
|
;; Clear the decompressors BSS (between _edata and _end)
|
||||||
|
|
||||||
|
- moveq 0, r0
|
||||||
|
- move.d _edata, r1
|
||||||
|
- move.d _end, r2
|
||||||
|
-1: move.w r0, [r1+]
|
||||||
|
- cmp.d r2, r1
|
||||||
|
+ moveq 0, $r0
|
||||||
|
+ move.d _edata, $r1
|
||||||
|
+ move.d _end, $r2
|
||||||
|
+1: move.w $r0, [$r1+]
|
||||||
|
+ cmp.d $r2, $r1
|
||||||
|
bcs 1b
|
||||||
|
nop
|
||||||
|
|
||||||
|
;; Save command line magic and address.
|
||||||
|
- move.d _cmd_line_magic, $r12
|
||||||
|
+ move.d cmd_line_magic, $r12
|
||||||
|
move.d $r10, [$r12]
|
||||||
|
- move.d _cmd_line_addr, $r12
|
||||||
|
+ move.d cmd_line_addr, $r12
|
||||||
|
move.d $r11, [$r12]
|
||||||
|
|
||||||
|
;; Do the decompression and save compressed size in _inptr
|
||||||
|
|
||||||
|
- jsr _decompress_kernel
|
||||||
|
+ jsr decompress_kernel
|
||||||
|
|
||||||
|
;; Put start address of root partition in r9 so the kernel can use it
|
||||||
|
;; when mounting from flash
|
||||||
|
|
||||||
|
- move.d [_input_data], r9 ; flash address of compressed kernel
|
||||||
|
- add.d [_inptr], r9 ; size of compressed kernel
|
||||||
|
+ move.d [input_data], $r9 ; flash address of compressed kernel
|
||||||
|
+ add.d [inptr], $r9 ; size of compressed kernel
|
||||||
|
|
||||||
|
;; Restore command line magic and address.
|
||||||
|
- move.d _cmd_line_magic, $r10
|
||||||
|
+ move.d cmd_line_magic, $r10
|
||||||
|
move.d [$r10], $r10
|
||||||
|
- move.d _cmd_line_addr, $r11
|
||||||
|
+ move.d cmd_line_addr, $r11
|
||||||
|
move.d [$r11], $r11
|
||||||
|
|
||||||
|
;; Enter the decompressed kernel
|
||||||
|
- move.d RAM_INIT_MAGIC, r8 ; Tell kernel that DRAM is initialized
|
||||||
|
+ move.d RAM_INIT_MAGIC, $r8 ; Tell kernel that DRAM is initialized
|
||||||
|
jump 0x40004000 ; kernel is linked to this address
|
||||||
|
|
||||||
|
.data
|
||||||
|
|
||||||
|
-_input_data:
|
||||||
|
+input_data:
|
||||||
|
.dword 0 ; used by the decompressor
|
||||||
|
-_cmd_line_magic:
|
||||||
|
+cmd_line_magic:
|
||||||
|
.dword 0
|
||||||
|
-_cmd_line_addr:
|
||||||
|
+cmd_line_addr:
|
||||||
|
.dword 0
|
||||||
|
#include "../../lib/hw_settings.S"
|
||||||
|
--- a/arch/cris/arch-v10/boot/compressed/misc.c
|
||||||
|
+++ b/arch/cris/arch-v10/boot/compressed/misc.c
|
||||||
|
@@ -5,7 +5,7 @@
|
||||||
|
* adapted for Linux.
|
||||||
|
*
|
||||||
|
* malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
|
||||||
|
- * puts by Nick Holloway 1993, better puts by Martin Mares 1995
|
||||||
|
+ * putstr by Nick Holloway 1993, better putstr by Martin Mares 1995
|
||||||
|
* adaptation for Linux/CRIS Axis Communications AB, 1999
|
||||||
|
*
|
||||||
|
*/
|
||||||
|
@@ -99,12 +99,12 @@ static void error(char *m);
|
||||||
|
static void gzip_mark(void **);
|
||||||
|
static void gzip_release(void **);
|
||||||
|
|
||||||
|
-static void puts(const char *);
|
||||||
|
+static void putstr(const char *);
|
||||||
|
|
||||||
|
/* the "heap" is put directly after the BSS ends, at end */
|
||||||
|
|
||||||
|
-extern int end;
|
||||||
|
-static long free_mem_ptr = (long)&end;
|
||||||
|
+extern int _end;
|
||||||
|
+static long free_mem_ptr = (long)&_end;
|
||||||
|
|
||||||
|
#include "../../../../../lib/inflate.c"
|
||||||
|
|
||||||
|
@@ -139,7 +139,7 @@ static void gzip_release(void **ptr)
|
||||||
|
/* decompressor info and error messages to serial console */
|
||||||
|
|
||||||
|
static void
|
||||||
|
-puts(const char *s)
|
||||||
|
+putstr(const char *s)
|
||||||
|
{
|
||||||
|
#ifndef CONFIG_ETRAX_DEBUG_PORT_NULL
|
||||||
|
while(*s) {
|
||||||
|
@@ -209,9 +209,9 @@ flush_window()
|
||||||
|
static void
|
||||||
|
error(char *x)
|
||||||
|
{
|
||||||
|
- puts("\n\n");
|
||||||
|
- puts(x);
|
||||||
|
- puts("\n\n -- System halted\n");
|
||||||
|
+ putstr("\n\n");
|
||||||
|
+ putstr(x);
|
||||||
|
+ putstr("\n\n -- System halted\n");
|
||||||
|
|
||||||
|
while(1); /* Halt */
|
||||||
|
}
|
||||||
|
@@ -257,14 +257,7 @@ decompress_kernel()
|
||||||
|
|
||||||
|
makecrc();
|
||||||
|
|
||||||
|
- __asm__ volatile ("move vr,%0" : "=rm" (revision));
|
||||||
|
- if (revision < 10)
|
||||||
|
- {
|
||||||
|
- puts("You need an ETRAX 100LX to run linux 2.6\n");
|
||||||
|
- while(1);
|
||||||
|
- }
|
||||||
|
-
|
||||||
|
- puts("Uncompressing Linux...\n");
|
||||||
|
+ putstr("Uncompressing Linux...\n");
|
||||||
|
gunzip();
|
||||||
|
- puts("Done. Now booting the kernel.\n");
|
||||||
|
+ putstr("Done. Now booting the kernel.\n");
|
||||||
|
}
|
||||||
|
--- a/arch/cris/arch-v10/mm/init.c
|
||||||
|
+++ b/arch/cris/arch-v10/mm/init.c
|
||||||
|
@@ -184,6 +184,9 @@ paging_init(void)
|
||||||
|
|
||||||
|
free_area_init_node(0, &contig_page_data, zones_size, PAGE_OFFSET >> PAGE_SHIFT, 0);
|
||||||
|
}
|
||||||
|
+void free_initrd_mem(unsigned long start, unsigned long end)
|
||||||
|
+{
|
||||||
|
+}
|
||||||
|
|
||||||
|
/* Initialize remaps of some I/O-ports. It is important that this
|
||||||
|
* is called before any driver is initialized.
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/drivers/net/cris/eth_v10.c
|
||||||
|
+++ b/drivers/net/cris/eth_v10.c
|
||||||
|
@@ -1707,7 +1707,7 @@ e100_set_network_leds(int active)
|
||||||
|
static void
|
||||||
|
e100_netpoll(struct net_device* netdev)
|
||||||
|
{
|
||||||
|
- e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev, NULL);
|
||||||
|
+ e100rxtx_interrupt(NETWORK_DMA_TX_IRQ_NBR, netdev);
|
||||||
|
}
|
||||||
|
#endif
|
||||||
|
|
||||||
|
|
@ -0,0 +1,11 @@
|
||||||
|
--- a/include/asm-cris/Kbuild
|
||||||
|
+++ b/include/asm-cris/Kbuild
|
||||||
|
@@ -1,7 +1,6 @@
|
||||||
|
include include/asm-generic/Kbuild.asm
|
||||||
|
|
||||||
|
-header-$(CONFIG_ETRAX_ARCH_V10) += arch-v10/
|
||||||
|
-header-$(CONFIG_ETRAX_ARCH_V32) += arch-v32/
|
||||||
|
+header-y += arch-v10/ arch-v32/
|
||||||
|
|
||||||
|
header-y += ethernet.h
|
||||||
|
header-y += rtc.h
|
||||||
|
|
@ -0,0 +1,13 @@
|
||||||
|
--- a/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
+++ b/drivers/mtd/chips/cfi_cmdset_0002.c
|
||||||
|
@@ -297,8 +297,8 @@ struct mtd_info *cfi_cmdset_0002(struct
|
||||||
|
return NULL;
|
||||||
|
}
|
||||||
|
|
||||||
|
- if (extp->MajorVersion != '1' ||
|
||||||
|
- (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
|
||||||
|
+ if (extp->MajorVersion < '0' || extp->MajorVersion > '3' ||
|
||||||
|
+ (extp->MinorVersion < '0' || extp->MinorVersion > '4')) {
|
||||||
|
if (cfi->mfr == MANUFACTURER_SAMSUNG &&
|
||||||
|
(extp->MajorVersion == '3' && extp->MinorVersion == '3')) {
|
||||||
|
printk(KERN_NOTICE " Newer Samsung flash detected, "
|
||||||
|
|
@ -0,0 +1,88 @@
|
||||||
|
--- a/arch/cris/arch-v10/lib/hw_settings.S
|
||||||
|
+++ b/arch/cris/arch-v10/lib/hw_settings.S
|
||||||
|
@@ -60,3 +60,5 @@
|
||||||
|
.dword R_PORT_PB_SET
|
||||||
|
.dword PB_SET_VALUE
|
||||||
|
.dword 0 ; No more register values
|
||||||
|
+ .ascii "ACME_PART_MAGIC"
|
||||||
|
+ .dword 0xdeadc0de
|
||||||
|
--- a/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||||
|
+++ b/arch/cris/arch-v10/drivers/axisflashmap.c
|
||||||
|
@@ -113,7 +113,7 @@ static struct map_info map_cse1 = {
|
||||||
|
|
||||||
|
/* If no partition-table was found, we use this default-set. */
|
||||||
|
#define MAX_PARTITIONS 7
|
||||||
|
-#define NUM_DEFAULT_PARTITIONS 3
|
||||||
|
+#define NUM_DEFAULT_PARTITIONS 2
|
||||||
|
|
||||||
|
/*
|
||||||
|
* Default flash size is 2MB. CONFIG_ETRAX_PTABLE_SECTOR is most likely the
|
||||||
|
@@ -122,19 +122,14 @@ static struct map_info map_cse1 = {
|
||||||
|
*/
|
||||||
|
static struct mtd_partition axis_default_partitions[NUM_DEFAULT_PARTITIONS] = {
|
||||||
|
{
|
||||||
|
- .name = "boot firmware",
|
||||||
|
- .size = CONFIG_ETRAX_PTABLE_SECTOR,
|
||||||
|
- .offset = 0
|
||||||
|
- },
|
||||||
|
- {
|
||||||
|
.name = "kernel",
|
||||||
|
- .size = 0x200000 - (6 * CONFIG_ETRAX_PTABLE_SECTOR),
|
||||||
|
- .offset = CONFIG_ETRAX_PTABLE_SECTOR
|
||||||
|
+ .size = 0x00,
|
||||||
|
+ .offset = 0
|
||||||
|
},
|
||||||
|
{
|
||||||
|
- .name = "filesystem",
|
||||||
|
- .size = 5 * CONFIG_ETRAX_PTABLE_SECTOR,
|
||||||
|
- .offset = 0x200000 - (5 * CONFIG_ETRAX_PTABLE_SECTOR)
|
||||||
|
+ .name = "rootfs",
|
||||||
|
+ .size = 0x200000 ,
|
||||||
|
+ .offset = 0x200000
|
||||||
|
}
|
||||||
|
};
|
||||||
|
|
||||||
|
@@ -281,6 +276,11 @@ static int __init init_axis_flash(void)
|
||||||
|
struct partitiontable_entry *ptable;
|
||||||
|
int use_default_ptable = 1; /* Until proven otherwise. */
|
||||||
|
const char pmsg[] = " /dev/flash%d at 0x%08x, size 0x%08x\n";
|
||||||
|
+ unsigned int kernel_part_size = 0;
|
||||||
|
+ unsigned char *flash_mem = (unsigned char*)(FLASH_CACHED_ADDR);
|
||||||
|
+ unsigned int flash_scan_count = 0;
|
||||||
|
+ const char *part_magic = "ACME_PART_MAGIC";
|
||||||
|
+ unsigned int magic_len = strlen(part_magic);
|
||||||
|
|
||||||
|
if (!(mymtd = flash_probe())) {
|
||||||
|
/* There's no reason to use this module if no flash chip can
|
||||||
|
@@ -292,6 +292,31 @@ static int __init init_axis_flash(void)
|
||||||
|
mymtd->name, mymtd->size);
|
||||||
|
axisflash_mtd = mymtd;
|
||||||
|
}
|
||||||
|
+ /* scan flash to findout where out partition starts */
|
||||||
|
+
|
||||||
|
+ printk(KERN_INFO "Scanning flash for end of kernel magic\n");
|
||||||
|
+ for(flash_scan_count = 0; flash_scan_count < 100000; flash_scan_count++){
|
||||||
|
+ if(strncmp(&flash_mem[flash_scan_count], part_magic, magic_len - 1) == 0)
|
||||||
|
+ {
|
||||||
|
+ kernel_part_size = flash_mem[flash_scan_count + magic_len ];
|
||||||
|
+ kernel_part_size <<= 8;
|
||||||
|
+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 2];
|
||||||
|
+ kernel_part_size <<= 8;
|
||||||
|
+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 1];
|
||||||
|
+ kernel_part_size <<= 8;
|
||||||
|
+ kernel_part_size += flash_mem[flash_scan_count + magic_len + 3];
|
||||||
|
+ printk(KERN_INFO "Kernel ends at 0x%.08X\n", kernel_part_size);
|
||||||
|
+ flash_scan_count = 1100000;
|
||||||
|
+ }
|
||||||
|
+ }
|
||||||
|
+
|
||||||
|
+
|
||||||
|
+ if(kernel_part_size){
|
||||||
|
+ kernel_part_size = (kernel_part_size & 0xffff0000);
|
||||||
|
+ axis_default_partitions[0].size = kernel_part_size;
|
||||||
|
+ axis_default_partitions[1].size = mymtd->size - axis_default_partitions[0].size;
|
||||||
|
+ axis_default_partitions[1].offset = axis_default_partitions[0].size;
|
||||||
|
+ }
|
||||||
|
|
||||||
|
if (mymtd) {
|
||||||
|
mymtd->owner = THIS_MODULE;
|
||||||
|
|
@ -0,0 +1,43 @@
|
||||||
|
--- a/drivers/serial/crisv10.c
|
||||||
|
+++ b/drivers/serial/crisv10.c
|
||||||
|
@@ -27,6 +27,7 @@ static char *serial_version = "$Revision
|
||||||
|
#include <linux/kernel.h>
|
||||||
|
#include <linux/mutex.h>
|
||||||
|
#include <linux/bitops.h>
|
||||||
|
+#include <linux/device.h>
|
||||||
|
|
||||||
|
#include <asm/io.h>
|
||||||
|
#include <asm/irq.h>
|
||||||
|
@@ -4384,6 +4385,7 @@ static const struct tty_operations rs_op
|
||||||
|
.tiocmset = rs_tiocmset
|
||||||
|
};
|
||||||
|
|
||||||
|
+static struct class *rs_class;
|
||||||
|
static int __init
|
||||||
|
rs_init(void)
|
||||||
|
{
|
||||||
|
@@ -4518,6 +4520,24 @@ rs_init(void)
|
||||||
|
#endif
|
||||||
|
#endif /* CONFIG_SVINTO_SIM */
|
||||||
|
|
||||||
|
+ rs_class = class_create(THIS_MODULE, "rs_tty");
|
||||||
|
+#ifdef CONFIG_ETRAX_SERIAL_PORT0
|
||||||
|
+ class_device_create(rs_class, NULL,
|
||||||
|
+ MKDEV(TTY_MAJOR, 64), NULL, "ttyS0");
|
||||||
|
+#endif
|
||||||
|
+#ifdef CONFIG_ETRAX_SERIAL_PORT1
|
||||||
|
+ class_device_create(rs_class, NULL,
|
||||||
|
+ MKDEV(TTY_MAJOR, 65), NULL, "ttyS1");
|
||||||
|
+#endif
|
||||||
|
+#ifdef CONFIG_ETRAX_SERIAL_PORT2
|
||||||
|
+ class_device_create(rs_class, NULL,
|
||||||
|
+ MKDEV(TTY_MAJOR, 66), NULL, "ttyS2");
|
||||||
|
+#endif
|
||||||
|
+#ifdef CONFIG_ETRAX_SERIAL_PORT3
|
||||||
|
+ class_device_create(rs_class, NULL,
|
||||||
|
+ MKDEV(TTY_MAJOR, 67), NULL, "ttyS3");
|
||||||
|
+#endif
|
||||||
|
+
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
File diff suppressed because it is too large
Load Diff
|
|
@ -0,0 +1,16 @@
|
||||||
|
Index: linux-2.6.25.20/arch/cris/Kconfig
|
||||||
|
===================================================================
|
||||||
|
--- linux-2.6.25.20.orig/arch/cris/Kconfig 2008-11-10 19:50:34.000000000 +0100
|
||||||
|
+++ linux-2.6.25.20/arch/cris/Kconfig 2009-01-30 13:03:46.000000000 +0100
|
||||||
|
@@ -660,6 +660,10 @@
|
||||||
|
|
||||||
|
source "drivers/ide/Kconfig"
|
||||||
|
|
||||||
|
+source "drivers/scsi/Kconfig"
|
||||||
|
+
|
||||||
|
+source "drivers/media/Kconfig"
|
||||||
|
+
|
||||||
|
source "drivers/net/Kconfig"
|
||||||
|
|
||||||
|
source "drivers/i2c/Kconfig"
|
||||||
|
|
||||||
Loading…
Reference in New Issue