diff options
| author |   Oyvind Repvik <nail@nslu2-linux.org> | 2005-08-19 18:19:35 +0000 |
|---|---|---|
| committer |   OpenEmbedded Project <openembedded-devel@lists.openembedded.org> | 2005-08-19 18:19:35 +0000 |
| commit | 1c3a6fbc2a5259dae51a6d0001051a9f0f2db9e0 (patch) | |
| tree | 31c164412ba5bed1b1467924a262f33c19e156a7 /packages/linux | |
| parent | 5bc0fa0024337ba8bec582084cabf6b8171e1aaf (diff) | |
| parent | e785b600f4ecf99625c5f0fe480a8873a0990a46 (diff) | |
| download | openembedded-1c3a6fbc2a5259dae51a6d0001051a9f0f2db9e0.tar.gz | |
propagate from branch 'org.openembedded.dev' (head f00fce6edbd12298c684d7d9dd99f46ce1614f1e)
to branch 'org.openembedded.nslu2-linux' (head 89864685adbed4d02c9aec37913e1eb64427a6de)
Diffstat (limited to 'packages/linux')
| -rw-r--r-- | packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c | 11 | ||||
| -rw-r--r-- | packages/linux/nslu2-kernel_2.6.12.2.bb | 2 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel/defconfig | 6 | ||||
| -rw-r--r-- | packages/linux/unslung-kernel_2.4.22.l2.3r29.bb | 2 |
4 files changed, 6 insertions, 15 deletions
diff --git a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c index 47be53bf81..cc3b987575 100644 --- a/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c +++ b/packages/linux/nslu2-kernel/2.6.12/nslu2-setup.c @@ -76,14 +76,10 @@ static struct resource nslu2_uart_resources[] = { .flags = IORESOURCE_MEM }, { - }, -#if 0 - , { .start = IXP4XX_UART2_BASE_PHYS, .end = IXP4XX_UART2_BASE_PHYS + 0x0fff, .flags = IORESOURCE_MEM } -#endif }; static struct plat_serial8250_port nslu2_uart_data[] = { @@ -97,19 +93,14 @@ static struct plat_serial8250_port nslu2_uart_data[] = { .uartclk = IXP4XX_UART_XTAL, }, { - }, - -#if 0 - , { .mapbase = IXP4XX_UART2_BASE_PHYS, .membase = (char *)IXP4XX_UART2_BASE_VIRT + REG_OFFSET, - .irq = IRQ_IXP4XX_UART1, + .irq = IRQ_IXP4XX_UART2, .flags = UPF_BOOT_AUTOCONF, .iotype = UPIO_MEM, .regshift = 2, .uartclk = IXP4XX_UART_XTAL, } -#endif }; static struct platform_device nslu2_uart = { diff --git a/packages/linux/nslu2-kernel_2.6.12.2.bb b/packages/linux/nslu2-kernel_2.6.12.2.bb index f15fc998a3..f51c8e2ba6 100644 --- a/packages/linux/nslu2-kernel_2.6.12.2.bb +++ b/packages/linux/nslu2-kernel_2.6.12.2.bb @@ -1,5 +1,5 @@ # Kernel for NSLU2 -PR = "r11" +PR = "r12" include nslu2-kernel.inc # N2K_EXTRA_PATCHES - list of patches to apply (can include diff --git a/packages/linux/unslung-kernel/defconfig b/packages/linux/unslung-kernel/defconfig index 01d6ab7e4e..208041c6d6 100644 --- a/packages/linux/unslung-kernel/defconfig +++ b/packages/linux/unslung-kernel/defconfig @@ -389,7 +389,7 @@ CONFIG_IP_PNP_BOOTP=y # IP: Netfilter Configuration # CONFIG_IP_NF_CONNTRACK=m -# CONFIG_IP_NF_FTP is not set +CONFIG_IP_NF_FTP=m # CONFIG_IP_NF_H323 is not set # CONFIG_IP_NF_AMANDA is not set # CONFIG_IP_NF_TFTP is not set @@ -398,8 +398,8 @@ CONFIG_IP_NF_CONNTRACK=m # CONFIG_IP_NF_PPTP is not set # CONFIG_IP_NF_MATCH_HELPER is not set # CONFIG_IP_NF_MATCH_STATE is not set -# CONFIG_IP_NF_MATCH_CONNTRACK is not set -# CONFIG_IP_NF_NAT is not set +CONFIG_IP_NF_MATCH_CONNTRACK=m +CONFIG_IP_NF_NAT=m CONFIG_IP_NF_QUEUE=m CONFIG_IP_NF_IPTABLES=m CONFIG_IP_NF_MATCH_LIMIT=m diff --git a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb index c02b45505e..cda40e1c0b 100644 --- a/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb +++ b/packages/linux/unslung-kernel_2.4.22.l2.3r29.bb @@ -4,7 +4,7 @@ include nslu2-linksys-kernel_2.4.22.bb DESCRIPTION = "Unslung kernel for the Linksys NSLU2 device" MAINTAINER = "NSLU2 Linux <www.nlsu2-linux.org>" -PR = "r4" +PR = "r5" KERNEL_SUFFIX = "unslung" |