upgrade sibyte to .30-rc4
SVN-Revision: 15545
This commit is contained in:
Imre Kaloz
parent
e50d6f12f7
commit
540556bb92
4 changed files with 95 additions and 22 deletions
|
|
@ -262,6 +262,7 @@ CONFIG_CLS_U32_PERF=y
|
|||
CONFIG_CMDLINE=""
|
||||
# CONFIG_CODA_FS is not set
|
||||
# CONFIG_COMPAT_BRK is not set
|
||||
CONFIG_COMPAT_NET_DEV_OPS=y
|
||||
CONFIG_CONFIGFS_FS=y
|
||||
# CONFIG_CONNECTOR is not set
|
||||
# CONFIG_CONTEXT_SWITCH_TRACER is not set
|
||||
|
|
@ -345,6 +346,7 @@ CONFIG_CRYPTO=y
|
|||
# CONFIG_CRYPTO_ZLIB is not set
|
||||
# CONFIG_DAB is not set
|
||||
# CONFIG_DAVICOM_PHY is not set
|
||||
# CONFIG_DCB is not set
|
||||
CONFIG_DEBUG_FS=y
|
||||
# CONFIG_DEBUG_KERNEL is not set
|
||||
# CONFIG_DEBUG_MEMORY_INIT is not set
|
||||
|
|
@ -363,6 +365,7 @@ CONFIG_DEFAULT_TCP_CONG="vegas"
|
|||
CONFIG_DEFAULT_WESTWOOD=y
|
||||
CONFIG_DEFCONFIG_LIST="/lib/modules/$UNAME_RELEASE/.config"
|
||||
# CONFIG_DEVKMEM is not set
|
||||
# CONFIG_DEVPTS_MULTIPLE_INSTANCES is not set
|
||||
# CONFIG_DGRS is not set
|
||||
# CONFIG_DISCONTIGMEM_MANUAL is not set
|
||||
# CONFIG_DISPLAY_SUPPORT is not set
|
||||
|
|
@ -638,8 +641,8 @@ CONFIG_INET=y
|
|||
# CONFIG_INFINIBAND is not set
|
||||
# CONFIG_INFTL is not set
|
||||
CONFIG_INIT_ENV_ARG_LIMIT=32
|
||||
CONFIG_INITRAMFS_COMPRESSION_NONE=y
|
||||
# CONFIG_INITRAMFS_COMPRESSION_LZMA is not set
|
||||
CONFIG_INITRAMFS_COMPRESSION_NONE=y
|
||||
# CONFIG_INOTIFY is not set
|
||||
# CONFIG_INOTIFY_USER is not set
|
||||
# CONFIG_INPUT_APANEL is not set
|
||||
|
|
@ -937,6 +940,7 @@ CONFIG_MINI_FO=y
|
|||
# CONFIG_MINIX_FS is not set
|
||||
# CONFIG_MINIX_SUBPARTITION is not set
|
||||
CONFIG_MISC_DEVICES=y
|
||||
CONFIG_MISC_FILESYSTEMS=y
|
||||
# CONFIG_MISDN_HFCPCI is not set
|
||||
# CONFIG_MISDN is not set
|
||||
# CONFIG_MKISS is not set
|
||||
|
|
@ -965,13 +969,16 @@ CONFIG_MSDOS_PARTITION=y
|
|||
# CONFIG_MTD_DOC2001 is not set
|
||||
# CONFIG_MTD_DOC2001PLUS is not set
|
||||
# CONFIG_MTD_INTEL_VR_NOR is not set
|
||||
# CONFIG_MTD_LPDDR is not set
|
||||
# CONFIG_MTD_M25P80 is not set
|
||||
# CONFIG_MTD_MYLOADER_PARTS is not set
|
||||
# CONFIG_MTD_NAND is not set
|
||||
# CONFIG_MTD_OOPS is not set
|
||||
# CONFIG_MTD_PHYSMAP_COMPAT is not set
|
||||
# CONFIG_MTD_REDBOOT_PARTS_UNALLOCATED is not set
|
||||
CONFIG_MTD_ROOTFS_ROOT_DEV=y
|
||||
CONFIG_MTD_ROOTFS_SPLIT=y
|
||||
# CONFIG_MTD_TESTS is not set
|
||||
# CONFIG_MTD_UBI is not set
|
||||
# CONFIG_MVSWITCH_PHY is not set
|
||||
# CONFIG_MWAVE is not set
|
||||
|
|
@ -981,6 +988,7 @@ CONFIG_MTD_ROOTFS_SPLIT=y
|
|||
# CONFIG_NATIONAL_PHY is not set
|
||||
# CONFIG_NCP_FS is not set
|
||||
# CONFIG_NE2K_PCI is not set
|
||||
# CONFIG_NEC_MARKEINS is not set
|
||||
# CONFIG_NET_9P is not set
|
||||
# CONFIG_NET_ACT_GACT is not set
|
||||
# CONFIG_NET_ACT_IPT is not set
|
||||
|
|
@ -1096,6 +1104,7 @@ CONFIG_NET_RADIO=y
|
|||
# CONFIG_NET_SCH_CLK_CPU is not set
|
||||
# CONFIG_NET_SCH_CLK_GETTIMEOFDAY is not set
|
||||
CONFIG_NET_SCH_CLK_JIFFIES=y
|
||||
# CONFIG_NET_SCH_DRR is not set
|
||||
# CONFIG_NET_SCH_DSMARK is not set
|
||||
CONFIG_NET_SCHED=y
|
||||
# CONFIG_NET_SCH_ESFQ is not set
|
||||
|
|
@ -1804,8 +1813,8 @@ CONFIG_STACKTRACE_SUPPORT=y
|
|||
CONFIG_STANDALONE=y
|
||||
# CONFIG_STE10XP is not set
|
||||
CONFIG_STP=y
|
||||
# CONFIG_STRIP is not set
|
||||
CONFIG_STRIP_ASM_SYMS=y
|
||||
# CONFIG_STRIP is not set
|
||||
# CONFIG_SUNDANCE is not set
|
||||
# CONFIG_SUNGEM is not set
|
||||
# CONFIG_SUN_PARTITION is not set
|
||||
|
|
|
|||
|
|
@ -11,7 +11,7 @@ BOARD:=sibyte
|
|||
BOARDNAME:=Broadcom/SiByte SB-1
|
||||
FEATURES:=broken
|
||||
|
||||
LINUX_VERSION:=2.6.28.9
|
||||
LINUX_VERSION:=2.6.30-rc4
|
||||
|
||||
include $(INCLUDE_DIR)/target.mk
|
||||
|
||||
|
|
|
|||
|
|
@ -19,6 +19,8 @@ CONFIG_BROADCOM_PHY=y
|
|||
# CONFIG_BSD_DISKLABEL is not set
|
||||
# CONFIG_BSD_PROCESS_ACCT is not set
|
||||
# CONFIG_BT is not set
|
||||
# CONFIG_CAVIUM_OCTEON_REFERENCE_BOARD is not set
|
||||
# CONFIG_CAVIUM_OCTEON_SIMULATOR is not set
|
||||
CONFIG_CEVT_SB1250=y
|
||||
CONFIG_CFE=y
|
||||
# CONFIG_CIFS_STATS is not set
|
||||
|
|
@ -50,13 +52,13 @@ CONFIG_CPU_HAS_SYNC=y
|
|||
# CONFIG_CPU_R8000 is not set
|
||||
# CONFIG_CPU_RM7000 is not set
|
||||
# CONFIG_CPU_RM9000 is not set
|
||||
CONFIG_CPU_SB1=y
|
||||
# CONFIG_CPU_SB1_PASS_1 is not set
|
||||
# CONFIG_CPU_SB1_PASS_2_112x is not set
|
||||
# CONFIG_CPU_SB1_PASS_2_1250 is not set
|
||||
# CONFIG_CPU_SB1_PASS_2_2 is not set
|
||||
CONFIG_CPU_SB1_PASS_3=y
|
||||
# CONFIG_CPU_SB1_PASS_4 is not set
|
||||
CONFIG_CPU_SB1=y
|
||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y
|
||||
CONFIG_CPU_SUPPORTS_64BIT_KERNEL=y
|
||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y
|
||||
|
|
@ -71,8 +73,8 @@ CONFIG_EARLY_PRINTK=y
|
|||
# CONFIG_FIXED_PHY is not set
|
||||
CONFIG_FS_POSIX_ACL=y
|
||||
CONFIG_FW_LOADER=m
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y
|
||||
CONFIG_GENERIC_CLOCKEVENTS=y
|
||||
CONFIG_GENERIC_CMOS_UPDATE=y
|
||||
# CONFIG_GENERIC_FIND_FIRST_BIT is not set
|
||||
CONFIG_GENERIC_FIND_NEXT_BIT=y
|
||||
|
|
@ -87,8 +89,8 @@ CONFIG_HAVE_IDE=y
|
|||
CONFIG_HAVE_OPROFILE=y
|
||||
CONFIG_HW_HAS_PCI=y
|
||||
CONFIG_HW_RANDOM=m
|
||||
CONFIG_HZ=250
|
||||
# CONFIG_HZ_100 is not set
|
||||
CONFIG_HZ=250
|
||||
CONFIG_HZ_250=y
|
||||
# CONFIG_I2C is not set
|
||||
# CONFIG_IBM_NEW_EMAC_EMAC4 is not set
|
||||
|
|
@ -108,17 +110,18 @@ CONFIG_INPUT=m
|
|||
# CONFIG_IP6_NF_MATCH_RT is not set
|
||||
# CONFIG_IP6_NF_TARGET_HL is not set
|
||||
# CONFIG_IP6_NF_TARGET_LOG is not set
|
||||
CONFIG_IPV6_NDISC_NODETYPE=y
|
||||
# CONFIG_IP_NF_ARPTABLES is not set
|
||||
# CONFIG_IP_NF_MATCH_ADDRTYPE is not set
|
||||
# CONFIG_IP_NF_TARGET_LOG is not set
|
||||
# CONFIG_IP_NF_TARGET_NETMAP is not set
|
||||
# CONFIG_IP_ROUTE_VERBOSE is not set
|
||||
CONFIG_IPV6_NDISC_NODETYPE=y
|
||||
CONFIG_IRQ_CPU=y
|
||||
# CONFIG_ISDN is not set
|
||||
# CONFIG_IWLWIFI_LEDS is not set
|
||||
# CONFIG_LEDS_ALIX is not set
|
||||
# CONFIG_LEMOTE_FULONG is not set
|
||||
# CONFIG_LIB80211 is not set
|
||||
# CONFIG_LLC2 is not set
|
||||
CONFIG_LOG_BUF_SHIFT=15
|
||||
# CONFIG_MACH_ALCHEMY is not set
|
||||
|
|
@ -131,7 +134,6 @@ CONFIG_LOG_BUF_SHIFT=15
|
|||
# CONFIG_MDIO_BITBANG is not set
|
||||
# CONFIG_MIKROTIK_RB532 is not set
|
||||
CONFIG_MINI_FO=m
|
||||
CONFIG_MIPS=y
|
||||
CONFIG_MIPS32_COMPAT=y
|
||||
# CONFIG_MIPS32_N32 is not set
|
||||
CONFIG_MIPS32_O32=y
|
||||
|
|
@ -145,12 +147,11 @@ CONFIG_MIPS_MT_DISABLED=y
|
|||
# CONFIG_MIPS_MT_SMTC is not set
|
||||
# CONFIG_MIPS_SEAD is not set
|
||||
# CONFIG_MIPS_SIM is not set
|
||||
CONFIG_MTD=y
|
||||
CONFIG_MIPS=y
|
||||
# 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_BLOCK=y
|
||||
# CONFIG_MTD_CFI_ADV_OPTIONS is not set
|
||||
CONFIG_MTD_CFI_AMDSTD=y
|
||||
CONFIG_MTD_CFI_I1=y
|
||||
|
|
@ -160,6 +161,7 @@ CONFIG_MTD_CFI_I2=y
|
|||
CONFIG_MTD_CFI_INTELEXT=y
|
||||
# CONFIG_MTD_CFI_STAA is not set
|
||||
CONFIG_MTD_CFI_UTIL=y
|
||||
CONFIG_MTD_CFI=y
|
||||
CONFIG_MTD_CHAR=y
|
||||
# CONFIG_MTD_CMDLINE_PARTS is not set
|
||||
CONFIG_MTD_COMPLEX_MAPPINGS=y
|
||||
|
|
@ -170,8 +172,8 @@ CONFIG_MTD_COMPLEX_MAPPINGS=y
|
|||
# CONFIG_MTD_DOC2001PLUS is not set
|
||||
CONFIG_MTD_GEN_PROBE=y
|
||||
# CONFIG_MTD_JEDECPROBE is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_16 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_1=y
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_2=y
|
||||
# CONFIG_MTD_MAP_BANK_WIDTH_32 is not set
|
||||
CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
||||
|
|
@ -181,22 +183,20 @@ CONFIG_MTD_MAP_BANK_WIDTH_4=y
|
|||
CONFIG_MTD_PARTITIONS=y
|
||||
# CONFIG_MTD_PHRAM is not set
|
||||
CONFIG_MTD_PHYSMAP=y
|
||||
CONFIG_MTD_PHYSMAP_BANKWIDTH=2
|
||||
CONFIG_MTD_PHYSMAP_LEN=0
|
||||
CONFIG_MTD_PHYSMAP_START=0x8000000
|
||||
# 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_MTD=y
|
||||
# CONFIG_NET_EMATCH is not set
|
||||
# CONFIG_NET_IPGRE_BROADCAST is not set
|
||||
# CONFIG_NET_PKTGEN is not set
|
||||
# CONFIG_NET_SCH_NETEM is not set
|
||||
# CONFIG_N_HDLC is not set
|
||||
# CONFIG_NO_IOPORT is not set
|
||||
# CONFIG_NXP_STB220 is not set
|
||||
# CONFIG_NXP_STB225 is not set
|
||||
# CONFIG_N_HDLC is not set
|
||||
CONFIG_PAGEFLAGS_EXTENDED=y
|
||||
# CONFIG_PAGE_SIZE_16KB is not set
|
||||
CONFIG_PAGE_SIZE_4KB=y
|
||||
|
|
@ -221,16 +221,16 @@ CONFIG_RESOURCES_64BIT=y
|
|||
CONFIG_RTC_LIB=y
|
||||
CONFIG_RWSEM_GENERIC_SPINLOCK=y
|
||||
CONFIG_SB1250_MAC=y
|
||||
# CONFIG_SB1XXX_CORELIS is not set
|
||||
# CONFIG_SB1_CERR_STALL is not set
|
||||
# CONFIG_SB1_CEX_ALWAYS_FATAL is not set
|
||||
# CONFIG_SB1XXX_CORELIS is not set
|
||||
CONFIG_SCHED_NO_NO_OMIT_FRAME_POINTER=y
|
||||
# CONFIG_SCSI is not set
|
||||
# CONFIG_SCSI_DMA is not set
|
||||
# CONFIG_SCSI is not set
|
||||
# CONFIG_SERIAL_8250 is not set
|
||||
CONFIG_SERIAL_NONSTANDARD=y
|
||||
CONFIG_SERIAL_SB1250_DUART=y
|
||||
CONFIG_SERIAL_SB1250_DUART_CONSOLE=y
|
||||
CONFIG_SERIAL_SB1250_DUART=y
|
||||
# CONFIG_SGI_IP22 is not set
|
||||
# CONFIG_SGI_IP27 is not set
|
||||
# CONFIG_SGI_IP28 is not set
|
||||
|
|
@ -240,8 +240,8 @@ CONFIG_SIBYTE_BCM112X=y
|
|||
# CONFIG_SIBYTE_BIGSUR is not set
|
||||
# CONFIG_SIBYTE_BUS_WATCHER is not set
|
||||
# CONFIG_SIBYTE_CARMEL is not set
|
||||
CONFIG_SIBYTE_CFE=y
|
||||
# CONFIG_SIBYTE_CFE_CONSOLE is not set
|
||||
CONFIG_SIBYTE_CFE=y
|
||||
# CONFIG_SIBYTE_CRHINE is not set
|
||||
# CONFIG_SIBYTE_CRHONE is not set
|
||||
# CONFIG_SIBYTE_DMA_PAGEOPS is not set
|
||||
|
|
@ -262,8 +262,6 @@ CONFIG_SIBYTE_SB1xxx_SOC=y
|
|||
CONFIG_SSB_POSSIBLE=y
|
||||
# CONFIG_STALDRV is not set
|
||||
CONFIG_SWAP_IO_SPACE=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_SYS_HAS_CPU_SB1=y
|
||||
CONFIG_SYS_HAS_EARLY_PRINTK=y
|
||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y
|
||||
|
|
@ -271,6 +269,8 @@ CONFIG_SYS_SUPPORTS_64BIT_KERNEL=y
|
|||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y
|
||||
CONFIG_SYS_SUPPORTS_BIG_ENDIAN=y
|
||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y
|
||||
CONFIG_SYSVIPC_COMPAT=y
|
||||
CONFIG_SYSVIPC_SYSCTL=y
|
||||
CONFIG_TICK_ONESHOT=y
|
||||
# CONFIG_TOSHIBA_JMR3927 is not set
|
||||
# CONFIG_TOSHIBA_RBTX4927 is not set
|
||||
|
|
|
|||
64
target/linux/sibyte/patches/001-rhone_physmap.patch
Normal file
64
target/linux/sibyte/patches/001-rhone_physmap.patch
Normal file
|
|
@ -0,0 +1,64 @@
|
|||
--- a/arch/mips/sibyte/swarm/platform.c 2009-04-30 06:48:16.000000000 +0200
|
||||
+++ b/arch/mips/sibyte/swarm/platform.c 2009-05-01 20:54:50.000000000 +0200
|
||||
@@ -83,3 +83,61 @@
|
||||
device_initcall(swarm_pata_init);
|
||||
|
||||
#endif /* defined(CONFIG_SIBYTE_SWARM) || defined(CONFIG_SIBYTE_LITTLESUR) */
|
||||
+
|
||||
+#ifdef CONFIG_SIBYTE_RHONE
|
||||
+
|
||||
+#include <linux/mtd/partitions.h>
|
||||
+#include <linux/mtd/physmap.h>
|
||||
+
|
||||
+static struct mtd_partition flash_parts[] = {
|
||||
+ {
|
||||
+ .name = "cfe",
|
||||
+ .offset = 0x00000000,
|
||||
+ .size = 0x00200000,
|
||||
+ .mask_flags = MTD_WRITEABLE,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "os",
|
||||
+ .offset = 0x00200000,
|
||||
+ .size = 0x00d00000,
|
||||
+ },
|
||||
+ {
|
||||
+ .name = "environment",
|
||||
+ .offset = 0x00f00000,
|
||||
+ .size = 0x00100000,
|
||||
+ .mask_flags = MTD_WRITEABLE,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static struct physmap_flash_data flash_data = {
|
||||
+ .width = 1,
|
||||
+ .nr_parts = ARRAY_SIZE(flash_parts),
|
||||
+ .parts = flash_parts,
|
||||
+};
|
||||
+
|
||||
+static struct resource flash_resource = {
|
||||
+ .start = 0x1fc00000,
|
||||
+ .end = 0x20bfffff,
|
||||
+ .flags = IORESOURCE_MEM,
|
||||
+};
|
||||
+
|
||||
+static struct platform_device flash_device = {
|
||||
+ .name = "physmap-flash",
|
||||
+ .id = 0,
|
||||
+ .resource = &flash_resource,
|
||||
+ .num_resources = 1,
|
||||
+ .dev = {
|
||||
+ .platform_data = &flash_data,
|
||||
+ },
|
||||
+};
|
||||
+
|
||||
+static int __init flash_setup(void)
|
||||
+{
|
||||
+ platform_device_register(&flash_device);
|
||||
+
|
||||
+ return 0;
|
||||
+};
|
||||
+
|
||||
+device_initcall(flash_setup);
|
||||
+
|
||||
+#endif /* CONFIG_SIBYTE_RHONE */
|
||||
Loading…
Reference in a new issue