Signed-off-by: Felix Fietkau <nbd@openwrt.org> SVN-Revision: 43689master
Felix Fietkau
10 years ago
parent
d34e2a337c
commit
0f25db1a7d
@ -1,147 +0,0 @@ |
|||||||
CONFIG_ARCH_BINFMT_ELF_RANDOMIZE_PIE=y |
|
||||||
CONFIG_ARCH_DISCARD_MEMBLOCK=y |
|
||||||
CONFIG_ARCH_HAS_ATOMIC64_DEC_IF_POSITIVE=y |
|
||||||
CONFIG_ARCH_HAVE_CUSTOM_GPIO_H=y |
|
||||||
CONFIG_ARCH_HIBERNATION_POSSIBLE=y |
|
||||||
CONFIG_ARCH_REQUIRE_GPIOLIB=y |
|
||||||
CONFIG_ARCH_SUSPEND_POSSIBLE=y |
|
||||||
CONFIG_ARCH_WANT_IPC_PARSE_VERSION=y |
|
||||||
CONFIG_ATA=y |
|
||||||
CONFIG_BLK_DEV_SD=y |
|
||||||
CONFIG_CC_OPTIMIZE_FOR_SIZE=y |
|
||||||
CONFIG_CEVT_R4K=y |
|
||||||
CONFIG_CLONE_BACKWARDS=y |
|
||||||
CONFIG_CPU_GENERIC_DUMP_TLB=y |
|
||||||
CONFIG_CPU_HAS_PREFETCH=y |
|
||||||
CONFIG_CPU_HAS_SYNC=y |
|
||||||
CONFIG_CPU_LITTLE_ENDIAN=y |
|
||||||
CONFIG_CPU_MIPS32=y |
|
||||||
CONFIG_CPU_MIPS32_R1=y |
|
||||||
CONFIG_CPU_MIPSR1=y |
|
||||||
CONFIG_CPU_R4K_CACHE_TLB=y |
|
||||||
CONFIG_CPU_R4K_FPU=y |
|
||||||
CONFIG_CPU_SUPPORTS_32BIT_KERNEL=y |
|
||||||
CONFIG_CPU_SUPPORTS_HIGHMEM=y |
|
||||||
CONFIG_CRC16=y |
|
||||||
CONFIG_CRYPTO_CRC32C=y |
|
||||||
CONFIG_CRYPTO_HASH=y |
|
||||||
CONFIG_CRYPTO_HASH2=y |
|
||||||
CONFIG_CSRC_R4K=y |
|
||||||
CONFIG_DMA_NONCOHERENT=y |
|
||||||
# CONFIG_ENABLE_WARN_DEPRECATED is not set |
|
||||||
CONFIG_EXT4_FS=y |
|
||||||
CONFIG_FS_MBCACHE=y |
|
||||||
CONFIG_GENERIC_ATOMIC64=y |
|
||||||
CONFIG_GENERIC_CLOCKEVENTS=y |
|
||||||
CONFIG_GENERIC_CLOCKEVENTS_BUILD=y |
|
||||||
CONFIG_GENERIC_CMOS_UPDATE=y |
|
||||||
CONFIG_GENERIC_IO=y |
|
||||||
CONFIG_GENERIC_IRQ_SHOW=y |
|
||||||
CONFIG_GENERIC_PCI_IOMAP=y |
|
||||||
CONFIG_GENERIC_SMP_IDLE_THREAD=y |
|
||||||
CONFIG_GPIOLIB=y |
|
||||||
CONFIG_GPIO_DEVRES=y |
|
||||||
CONFIG_GPIO_SYSFS=y |
|
||||||
# CONFIG_HAMRADIO is not set |
|
||||||
CONFIG_HARDWARE_WATCHPOINTS=y |
|
||||||
CONFIG_HAS_DMA=y |
|
||||||
CONFIG_HAS_IOMEM=y |
|
||||||
CONFIG_HAS_IOPORT=y |
|
||||||
# CONFIG_HAVE_64BIT_ALIGNED_ACCESS is not set |
|
||||||
CONFIG_HAVE_ARCH_JUMP_LABEL=y |
|
||||||
CONFIG_HAVE_ARCH_KGDB=y |
|
||||||
# CONFIG_HAVE_BOOTMEM_INFO_NODE is not set |
|
||||||
CONFIG_HAVE_C_RECORDMCOUNT=y |
|
||||||
CONFIG_HAVE_DEBUG_KMEMLEAK=y |
|
||||||
CONFIG_HAVE_DMA_API_DEBUG=y |
|
||||||
CONFIG_HAVE_DMA_ATTRS=y |
|
||||||
CONFIG_HAVE_DYNAMIC_FTRACE=y |
|
||||||
CONFIG_HAVE_FTRACE_MCOUNT_RECORD=y |
|
||||||
CONFIG_HAVE_FUNCTION_GRAPH_TRACER=y |
|
||||||
CONFIG_HAVE_FUNCTION_TRACER=y |
|
||||||
CONFIG_HAVE_FUNCTION_TRACE_MCOUNT_TEST=y |
|
||||||
CONFIG_HAVE_GENERIC_DMA_COHERENT=y |
|
||||||
CONFIG_HAVE_GENERIC_HARDIRQS=y |
|
||||||
CONFIG_HAVE_IDE=y |
|
||||||
CONFIG_HAVE_MEMBLOCK=y |
|
||||||
CONFIG_HAVE_MEMBLOCK_NODE_MAP=y |
|
||||||
CONFIG_HAVE_MOD_ARCH_SPECIFIC=y |
|
||||||
CONFIG_HAVE_NET_DSA=y |
|
||||||
CONFIG_HAVE_OPROFILE=y |
|
||||||
CONFIG_HAVE_PERF_EVENTS=y |
|
||||||
# CONFIG_HIGH_RES_TIMERS is not set |
|
||||||
CONFIG_HW_HAS_PCI=y |
|
||||||
CONFIG_HW_RANDOM=y |
|
||||||
CONFIG_HZ=250 |
|
||||||
# CONFIG_HZ_100 is not set |
|
||||||
CONFIG_HZ_250=y |
|
||||||
CONFIG_HZ_PERIODIC=y |
|
||||||
CONFIG_IMAGE_CMDLINE_HACK=y |
|
||||||
CONFIG_INITRAMFS_SOURCE="" |
|
||||||
CONFIG_IRQ_CPU=y |
|
||||||
CONFIG_IRQ_FORCED_THREADING=y |
|
||||||
CONFIG_IRQ_WORK=y |
|
||||||
CONFIG_JBD2=y |
|
||||||
CONFIG_KEXEC=y |
|
||||||
CONFIG_KORINA=y |
|
||||||
CONFIG_LEDS_MIKROTIK_RB532=y |
|
||||||
CONFIG_MIKROTIK_RB532=y |
|
||||||
CONFIG_MIPS=y |
|
||||||
# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set |
|
||||||
CONFIG_MIPS_L1_CACHE_SHIFT=4 |
|
||||||
# CONFIG_MIPS_MACHINE is not set |
|
||||||
CONFIG_MIPS_MT_DISABLED=y |
|
||||||
CONFIG_MODULES_USE_ELF_REL=y |
|
||||||
CONFIG_MTD_BLOCK2MTD=y |
|
||||||
CONFIG_MTD_CFI_ADV_OPTIONS=y |
|
||||||
# CONFIG_MTD_CFI_AMDSTD is not set |
|
||||||
CONFIG_MTD_CFI_GEOMETRY=y |
|
||||||
# CONFIG_MTD_CFI_INTELEXT is not set |
|
||||||
# CONFIG_MTD_COMPLEX_MAPPINGS is not set |
|
||||||
CONFIG_MTD_NAND=y |
|
||||||
CONFIG_MTD_NAND_ECC=y |
|
||||||
CONFIG_MTD_NAND_PLATFORM=y |
|
||||||
CONFIG_MTD_PHYSMAP=y |
|
||||||
# CONFIG_MTD_ROOTFS_ROOT_DEV is not set |
|
||||||
CONFIG_MTD_ROOTFS_SPLIT=y |
|
||||||
# CONFIG_MTD_SM_COMMON is not set |
|
||||||
# CONFIG_MTD_SPLIT is not set |
|
||||||
CONFIG_NEED_DMA_MAP_STATE=y |
|
||||||
CONFIG_NEED_PER_CPU_KM=y |
|
||||||
CONFIG_NO_GENERIC_PCI_IOPORT_MAP=y |
|
||||||
CONFIG_PAGEFLAGS_EXTENDED=y |
|
||||||
CONFIG_PATA_RB532=y |
|
||||||
CONFIG_PCI=y |
|
||||||
CONFIG_PCI_DISABLE_COMMON_QUIRKS=y |
|
||||||
CONFIG_PCI_DOMAINS=y |
|
||||||
CONFIG_PERF_USE_VMALLOC=y |
|
||||||
# CONFIG_PREEMPT_RCU is not set |
|
||||||
CONFIG_RC32434_WDT=y |
|
||||||
# CONFIG_RCU_STALL_COMMON is not set |
|
||||||
CONFIG_SCSI=y |
|
||||||
# CONFIG_SCSI_LOWLEVEL is not set |
|
||||||
# CONFIG_SCSI_MULTI_LUN is not set |
|
||||||
# CONFIG_SCSI_PROC_FS is not set |
|
||||||
# CONFIG_SWAP is not set |
|
||||||
CONFIG_SWAP_IO_SPACE=y |
|
||||||
CONFIG_SYS_HAS_CPU_MIPS32_R1=y |
|
||||||
CONFIG_SYS_SUPPORTS_32BIT_KERNEL=y |
|
||||||
CONFIG_SYS_SUPPORTS_ARBIT_HZ=y |
|
||||||
CONFIG_SYS_SUPPORTS_LITTLE_ENDIAN=y |
|
||||||
CONFIG_TICK_CPU_ACCOUNTING=y |
|
||||||
CONFIG_UIDGID_CONVERTED=y |
|
||||||
CONFIG_USB_ARCH_HAS_XHCI=y |
|
||||||
CONFIG_VIA_RHINE=y |
|
||||||
CONFIG_VIA_RHINE_MMIO=y |
|
||||||
CONFIG_YAFFS_9BYTE_TAGS=y |
|
||||||
# CONFIG_YAFFS_ALWAYS_CHECK_CHUNK_ERASED is not set |
|
||||||
CONFIG_YAFFS_AUTO_YAFFS2=y |
|
||||||
# CONFIG_YAFFS_DISABLE_BACKGROUND is not set |
|
||||||
# CONFIG_YAFFS_DISABLE_BLOCK_REFRESHING is not set |
|
||||||
# CONFIG_YAFFS_DISABLE_TAGS_ECC is not set |
|
||||||
# CONFIG_YAFFS_EMPTY_LOST_AND_FOUND is not set |
|
||||||
CONFIG_YAFFS_FS=y |
|
||||||
CONFIG_YAFFS_XATTR=y |
|
||||||
CONFIG_YAFFS_YAFFS1=y |
|
||||||
CONFIG_YAFFS_YAFFS2=y |
|
||||||
CONFIG_ZONE_DMA_FLAG=0 |
|
||||||
@ -1,20 +0,0 @@ |
|||||||
--- a/arch/mips/rb532/prom.c
|
|
||||||
+++ b/arch/mips/rb532/prom.c
|
|
||||||
@@ -67,6 +67,7 @@ static inline unsigned long tag2ul(char
|
|
||||||
return simple_strtoul(num, 0, 10);
|
|
||||||
}
|
|
||||||
|
|
||||||
+extern char __image_cmdline[];
|
|
||||||
void __init prom_setup_cmdline(void)
|
|
||||||
{
|
|
||||||
static char cmd_line[COMMAND_LINE_SIZE] __initdata;
|
|
||||||
@@ -108,6 +109,9 @@ void __init prom_setup_cmdline(void)
|
|
||||||
}
|
|
||||||
*(cp++) = ' ';
|
|
||||||
|
|
||||||
+ strcpy(cp,(__image_cmdline));
|
|
||||||
+ cp += strlen(__image_cmdline);
|
|
||||||
+
|
|
||||||
i = strlen(arcs_cmdline);
|
|
||||||
if (i > 0) {
|
|
||||||
*(cp++) = ' ';
|
|
||||||
@ -1,47 +0,0 @@ |
|||||||
--- a/arch/mips/rb532/devices.c
|
|
||||||
+++ b/arch/mips/rb532/devices.c
|
|
||||||
@@ -140,6 +140,19 @@ static struct platform_device cf_slot0 =
|
|
||||||
};
|
|
||||||
|
|
||||||
/* Resources and device for NAND */
|
|
||||||
+
|
|
||||||
+/*
|
|
||||||
+ * We need to use the OLD Yaffs-1 OOB layout, otherwise the RB bootloader
|
|
||||||
+ * will not be able to find the kernel that we load. So set the oobinfo
|
|
||||||
+ * when creating the partitions
|
|
||||||
+ */
|
|
||||||
+static struct nand_ecclayout rb532_nand_ecclayout = {
|
|
||||||
+ .eccbytes = 6,
|
|
||||||
+ .eccpos = { 8, 9, 10, 13, 14, 15 },
|
|
||||||
+ .oobavail = 9,
|
|
||||||
+ .oobfree = { { 0, 4 }, { 6, 2 }, { 11, 2 }, { 4, 1 } }
|
|
||||||
+};
|
|
||||||
+
|
|
||||||
static int rb532_dev_ready(struct mtd_info *mtd)
|
|
||||||
{
|
|
||||||
return gpio_get_value(GPIO_RDY);
|
|
||||||
@@ -275,6 +288,16 @@ static void __init parse_mac_addr(char *
|
|
||||||
/* NAND definitions */
|
|
||||||
#define NAND_CHIP_DELAY 25
|
|
||||||
|
|
||||||
+static int rb532_nand_fixup(struct mtd_info *mtd)
|
|
||||||
+{
|
|
||||||
+ struct nand_chip *chip = mtd->priv;
|
|
||||||
+
|
|
||||||
+ if (mtd->writesize == 512)
|
|
||||||
+ chip->ecc.layout = &rb532_nand_ecclayout;
|
|
||||||
+
|
|
||||||
+ return 0;
|
|
||||||
+}
|
|
||||||
+
|
|
||||||
static void __init rb532_nand_setup(void)
|
|
||||||
{
|
|
||||||
switch (mips_machtype) {
|
|
||||||
@@ -293,6 +316,7 @@ static void __init rb532_nand_setup(void
|
|
||||||
rb532_nand_data.chip.nr_partitions = ARRAY_SIZE(rb532_partition_info);
|
|
||||||
rb532_nand_data.chip.partitions = rb532_partition_info;
|
|
||||||
rb532_nand_data.chip.chip_delay = NAND_CHIP_DELAY;
|
|
||||||
+ rb532_nand_data.chip.chip_fixup = &rb532_nand_fixup;
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@ -1,37 +0,0 @@ |
|||||||
From patchwork Thu May 15 08:35:44 2014
|
|
||||||
Content-Type: text/plain; charset="utf-8"
|
|
||||||
MIME-Version: 1.0
|
|
||||||
Content-Transfer-Encoding: 7bit
|
|
||||||
Subject: MIPS: RC32434: fix broken PCI resource initialization
|
|
||||||
From: Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
X-Patchwork-Id: 6940
|
|
||||||
Message-Id: <1400142944-32147-1-git-send-email-juhosg@openwrt.org>
|
|
||||||
To: Ralf Baechle <ralf@linux-mips.org>
|
|
||||||
Cc: linux-mips@linux-mips.org, Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
Date: Thu, 15 May 2014 10:35:44 +0200
|
|
||||||
|
|
||||||
The parent field of the 'rc32434_res_pci_mem1' resource points to
|
|
||||||
the resource itself which is obviously wrong. Due to the broken
|
|
||||||
initialitazion, the PCI devices on the Mikrotik RB532 boards are
|
|
||||||
not working since commit 22283178 (MIPS: avoid possible resource
|
|
||||||
conflict in register_pci_controller).
|
|
||||||
|
|
||||||
Remove the field initialization to fix the issue.
|
|
||||||
|
|
||||||
Reported-by: Waldemar Brodkorb <wbx@openadk.org>
|
|
||||||
Signed-off-by: Gabor Juhos <juhosg@openwrt.org>
|
|
||||||
|
|
||||||
---
|
|
||||||
arch/mips/pci/pci-rc32434.c | 1 -
|
|
||||||
1 file changed, 1 deletion(-)
|
|
||||||
|
|
||||||
--- a/arch/mips/pci/pci-rc32434.c
|
|
||||||
+++ b/arch/mips/pci/pci-rc32434.c
|
|
||||||
@@ -53,7 +53,6 @@ static struct resource rc32434_res_pci_m
|
|
||||||
.start = 0x50000000,
|
|
||||||
.end = 0x5FFFFFFF,
|
|
||||||
.flags = IORESOURCE_MEM,
|
|
||||||
- .parent = &rc32434_res_pci_mem1,
|
|
||||||
.sibling = NULL,
|
|
||||||
.child = &rc32434_res_pci_mem2
|
|
||||||
};
|
|
||||||
@ -1,11 +0,0 @@ |
|||||||
--- a/arch/mips/rb532/devices.c 2014-07-07 01:05:10.000000000 +0300
|
|
||||||
+++ b/arch/mips/rb532/devices.c 2014-07-07 01:05:27.268505016 +0300
|
|
||||||
@@ -202,7 +202,7 @@ static struct mtd_partition rb532_partit
|
|
||||||
.offset = 0,
|
|
||||||
.size = 4 * 1024 * 1024,
|
|
||||||
}, {
|
|
||||||
- .name = "rootfs",
|
|
||||||
+ .name = "rootfs_onboard",
|
|
||||||
.offset = MTDPART_OFS_NXTBLK,
|
|
||||||
.size = MTDPART_SIZ_FULL,
|
|
||||||
}
|
|
||||||
Loading…
Reference in new issue