[OpenWrt-Devel] [PATCH 0/5] PLXTECH/Oxford NAS 782x SoC family support

John Crispin blogic at openwrt.org
Tue Nov 25 06:07:13 EST 2014


aloha

On 25/11/2014 11:44, Daniel Golle wrote:
> One year after starting to work on the oxnas target, I think that
> things are in a shape which would allow merging the target with
> OpenWrt. Now that things are imho rather clean and stable, I'd
> prefer having the target merged and no longer maintaining a
> seperate fork. Thus I squashed stuff up into this series of
> patches, the history of the development process can be found on 
> http://gitorious.org/openwrt-oxnas/openwrt-oxnas
> 


nice to see the code reach the point where we can merge it.

are you planning on upstreaming this ? 12k insertions are a lot to
carry around with us.

i have just merged this stuff in my local queue and will start a test
build in a sec.

	John


> Daniel Golle (5): kernel: unset CONFIG_ARM_CCN target.mk: add
> default packages for NAS device-type add new target 'oxnas' add
> uboot-oxnas uboot-envtools: add support for oxnas target
> 
> include/target.mk                                  |    2 + 
> package/boot/uboot-envtools/Makefile               |    4 + 
> package/boot/uboot-envtools/files/oxnas            |   29 + 
> package/boot/uboot-oxnas/Makefile                  |   97 + 
> .../files/arch/arm/cpu/arm1136/nas782x/Makefile    |   13 + 
> .../files/arch/arm/cpu/arm1136/nas782x/clock.c     |   97 + 
> .../files/arch/arm/cpu/arm1136/nas782x/pinmux.c    |   43 + 
> .../files/arch/arm/cpu/arm1136/nas782x/reset.c     |   91 + 
> .../files/arch/arm/cpu/arm1136/nas782x/timer.c     |  129 ++ 
> .../arch/arm/include/asm/arch-nas782x/clock.h      |   84 + 
> .../files/arch/arm/include/asm/arch-nas782x/cpu.h  |   26 + 
> .../arch/arm/include/asm/arch-nas782x/hardware.h   |   30 + 
> .../arch/arm/include/asm/arch-nas782x/pinmux.h     |   46 + 
> .../files/arch/arm/include/asm/arch-nas782x/spl.h  |    6 + 
> .../arch/arm/include/asm/arch-nas782x/sysctl.h     |  125 ++ 
> .../arch/arm/include/asm/arch-nas782x/timer.h      |   23 + 
> .../boot/uboot-oxnas/files/board/ox820/Makefile    |   15 + 
> package/boot/uboot-oxnas/files/board/ox820/ddr.c   |  477 +++++ 
> package/boot/uboot-oxnas/files/board/ox820/ddr.h   |  148 ++ 
> .../uboot-oxnas/files/board/ox820/lowlevel_init.S  |   20 + 
> package/boot/uboot-oxnas/files/board/ox820/ox820.c |  373 ++++ 
> .../boot/uboot-oxnas/files/board/ox820/spl_start.S |   21 + 
> .../uboot-oxnas/files/board/ox820/u-boot-spl.lds   |  101 ++ 
> package/boot/uboot-oxnas/files/common/env_ext4.c   |  116 ++ 
> .../boot/uboot-oxnas/files/common/spl/spl_block.c  |  236 +++ 
> .../uboot-oxnas/files/drivers/block/plxsata_ide.c  | 1170
> ++++++++++++ .../files/drivers/usb/host/ehci-oxnas.c            |
> 105 ++ .../boot/uboot-oxnas/files/include/configs/ox820.h |  381
> ++++ package/boot/uboot-oxnas/files/tools/mkox820crc.c  |  123 ++ 
> .../boot/uboot-oxnas/patches/150-spl-block.patch   |   54 + 
> .../uboot-oxnas/patches/300-oxnas-target.patch     |   99 + 
> .../patches/800-fix-bootm-assertion.patch          |   13 + 
> package/kernel/linux/modules/usb.mk                |   17 + 
> target/linux/generic/config-3.18                   |    1 + 
> target/linux/oxnas/Makefile                        |   28 + 
> target/linux/oxnas/base-files.mk                   |    3 + 
> target/linux/oxnas/base-files/etc/board.d/01_leds  |   25 + 
> .../linux/oxnas/base-files/etc/board.d/02_network  |   12 + 
> target/linux/oxnas/base-files/etc/diag.sh          |   35 + 
> target/linux/oxnas/base-files/lib/oxnas.sh         |   48 + 
> .../base-files/lib/preinit/03_preinit_do_oxnas.sh  |    9 + 
> .../linux/oxnas/base-files/lib/upgrade/platform.sh |   35 + 
> target/linux/oxnas/config-3.18                     |  366 ++++ 
> .../oxnas/files/arch/arm/boot/dts/ox820-kd20.dts   |  136 ++ 
> .../files/arch/arm/boot/dts/ox820-pogoplug-pro.dts |   86 + 
> .../files/arch/arm/boot/dts/ox820-pogoplug-v3.dts  |   83 + 
> .../oxnas/files/arch/arm/boot/dts/ox820-stg212.dts |   91 + 
> .../linux/oxnas/files/arch/arm/boot/dts/ox820.dtsi |  342 ++++ 
> .../oxnas/files/arch/arm/configs/ox820_defconfig   |  104 ++ 
> .../linux/oxnas/files/arch/arm/mach-oxnas/Kconfig  |   24 + 
> .../linux/oxnas/files/arch/arm/mach-oxnas/Makefile |    8 + 
> .../oxnas/files/arch/arm/mach-oxnas/Makefile.boot  |    2 + 
> target/linux/oxnas/files/arch/arm/mach-oxnas/fiq.S |   87 + 
> .../oxnas/files/arch/arm/mach-oxnas/headsmp.S      |   27 + 
> .../oxnas/files/arch/arm/mach-oxnas/hotplug.c      |  112 ++ 
> .../arch/arm/mach-oxnas/include/mach/hardware.h    |  233 +++ 
> .../files/arch/arm/mach-oxnas/include/mach/iomap.h |   33 + 
> .../files/arch/arm/mach-oxnas/include/mach/irqs.h  |    7 + 
> .../files/arch/arm/mach-oxnas/include/mach/smp.h   |   34 + 
> .../files/arch/arm/mach-oxnas/include/mach/timex.h |    6 + 
> .../arch/arm/mach-oxnas/include/mach/uncompress.h  |   32 + 
> .../files/arch/arm/mach-oxnas/include/mach/utils.h |   34 + 
> .../oxnas/files/arch/arm/mach-oxnas/mach-ox820.c   |  284 +++ 
> .../oxnas/files/arch/arm/mach-oxnas/platsmp.c      |  315 ++++ 
> target/linux/oxnas/files/drivers/ata/sata_oxnas.c  | 1889
> ++++++++++++++++++++ 
> target/linux/oxnas/files/drivers/clk/clk-oxnas.c   |  262 +++ 
> .../files/drivers/clocksource/oxnas_rps_timer.c    |   96 + 
> target/linux/oxnas/files/drivers/irqchip/irq-rps.c |  146 ++ 
> .../oxnas/files/drivers/mtd/nand/oxnas_nand.c      |  102 ++ 
> .../oxnas/files/drivers/pci/host/pcie-oxnas.c      |  676 +++++++ 
> .../oxnas/files/drivers/pinctrl/pinctrl-oxnas.c    | 1480
> +++++++++++++++ .../linux/oxnas/files/drivers/reset/reset-ox820.c
> |  107 ++ .../oxnas/files/drivers/usb/host/ehci-oxnas.c      |  316
> ++++ target/linux/oxnas/image/Makefile                  |  135 ++ 
> .../010-arm_introduce-dma-fiq-irq-broadcast.patch  |   62 + 
> .../250-add-plxtech-vendor-prefix.patch            |   12 + 
> .../300-introduce-oxnas-platform.patch             |   79 + 
> .../oxnas/patches-3.18/310-oxnas-clocksource.patch |   29 + 
> .../oxnas/patches-3.18/320-oxnas-irqchip.patch     |   40 + 
> .../oxnas/patches-3.18/330-oxnas-pinctrl.patch     |   32 + 
> .../linux/oxnas/patches-3.18/340-oxnas-pcie.patch  |   26 + 
> .../linux/oxnas/patches-3.18/350-oxnas-reset.patch |   24 + 
> .../linux/oxnas/patches-3.18/400-oxnas-nand.patch  |   28 + 
> .../linux/oxnas/patches-3.18/500-oxnas-sata.patch  |   30 + 
> .../linux/oxnas/patches-3.18/800-oxnas-ehci.patch  |   30 + 
> .../linux/oxnas/patches-3.18/900-more-boards.patch |   16 + 
> target/linux/oxnas/profiles/100-Generic.mk         |   53 + 87
> files changed, 12626 insertions(+) create mode 100644
> package/boot/uboot-envtools/files/oxnas create mode 100644
> package/boot/uboot-oxnas/Makefile create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/Makefile
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/clock.c
> create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/pinmux.c
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/reset.c
> create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/cpu/arm1136/nas782x/timer.c
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/clock.h
> create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/cpu.h
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/hardware.h
> create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/pinmux.h
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/spl.h
> create mode 100644
> package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/sysctl.h
>
> 
create mode 100644
package/boot/uboot-oxnas/files/arch/arm/include/asm/arch-nas782x/timer.h
> create mode 100644
> package/boot/uboot-oxnas/files/board/ox820/Makefile create mode
> 100755 package/boot/uboot-oxnas/files/board/ox820/ddr.c create mode
> 100644 package/boot/uboot-oxnas/files/board/ox820/ddr.h create mode
> 100644 package/boot/uboot-oxnas/files/board/ox820/lowlevel_init.S 
> create mode 100644
> package/boot/uboot-oxnas/files/board/ox820/ox820.c create mode
> 100644 package/boot/uboot-oxnas/files/board/ox820/spl_start.S 
> create mode 100644
> package/boot/uboot-oxnas/files/board/ox820/u-boot-spl.lds create
> mode 100644 package/boot/uboot-oxnas/files/common/env_ext4.c create
> mode 100644 package/boot/uboot-oxnas/files/common/spl/spl_block.c 
> create mode 100644
> package/boot/uboot-oxnas/files/drivers/block/plxsata_ide.c create
> mode 100644
> package/boot/uboot-oxnas/files/drivers/usb/host/ehci-oxnas.c create
> mode 100644 package/boot/uboot-oxnas/files/include/configs/ox820.h 
> create mode 100644
> package/boot/uboot-oxnas/files/tools/mkox820crc.c create mode
> 100644 package/boot/uboot-oxnas/patches/150-spl-block.patch create
> mode 100644
> package/boot/uboot-oxnas/patches/300-oxnas-target.patch create mode
> 100644
> package/boot/uboot-oxnas/patches/800-fix-bootm-assertion.patch 
> create mode 100644 target/linux/oxnas/Makefile create mode 100644
> target/linux/oxnas/base-files.mk create mode 100755
> target/linux/oxnas/base-files/etc/board.d/01_leds create mode
> 100755 target/linux/oxnas/base-files/etc/board.d/02_network create
> mode 100755 target/linux/oxnas/base-files/etc/diag.sh create mode
> 100755 target/linux/oxnas/base-files/lib/oxnas.sh create mode
> 100644
> target/linux/oxnas/base-files/lib/preinit/03_preinit_do_oxnas.sh 
> create mode 100644
> target/linux/oxnas/base-files/lib/upgrade/platform.sh create mode
> 100644 target/linux/oxnas/config-3.18 create mode 100644
> target/linux/oxnas/files/arch/arm/boot/dts/ox820-kd20.dts create
> mode 100644
> target/linux/oxnas/files/arch/arm/boot/dts/ox820-pogoplug-pro.dts 
> create mode 100644
> target/linux/oxnas/files/arch/arm/boot/dts/ox820-pogoplug-v3.dts 
> create mode 100644
> target/linux/oxnas/files/arch/arm/boot/dts/ox820-stg212.dts create
> mode 100644 target/linux/oxnas/files/arch/arm/boot/dts/ox820.dtsi 
> create mode 100644
> target/linux/oxnas/files/arch/arm/configs/ox820_defconfig create
> mode 100644 target/linux/oxnas/files/arch/arm/mach-oxnas/Kconfig 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/Makefile create mode
> 100644 target/linux/oxnas/files/arch/arm/mach-oxnas/Makefile.boot 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/fiq.S create mode
> 100644 target/linux/oxnas/files/arch/arm/mach-oxnas/headsmp.S 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/hotplug.c create mode
> 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/hardware.h
>
> 
create mode 100644
target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/iomap.h
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/irqs.h 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/smp.h 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/timex.h 
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/uncompress.h
>
> 
create mode 100644
target/linux/oxnas/files/arch/arm/mach-oxnas/include/mach/utils.h
> create mode 100644
> target/linux/oxnas/files/arch/arm/mach-oxnas/mach-ox820.c create
> mode 100644 target/linux/oxnas/files/arch/arm/mach-oxnas/platsmp.c 
> create mode 100644
> target/linux/oxnas/files/drivers/ata/sata_oxnas.c create mode
> 100644 target/linux/oxnas/files/drivers/clk/clk-oxnas.c create mode
> 100644
> target/linux/oxnas/files/drivers/clocksource/oxnas_rps_timer.c 
> create mode 100644
> target/linux/oxnas/files/drivers/irqchip/irq-rps.c create mode
> 100644 target/linux/oxnas/files/drivers/mtd/nand/oxnas_nand.c 
> create mode 100644
> target/linux/oxnas/files/drivers/pci/host/pcie-oxnas.c create mode
> 100644 target/linux/oxnas/files/drivers/pinctrl/pinctrl-oxnas.c 
> create mode 100644
> target/linux/oxnas/files/drivers/reset/reset-ox820.c create mode
> 100644 target/linux/oxnas/files/drivers/usb/host/ehci-oxnas.c 
> create mode 100644 target/linux/oxnas/image/Makefile create mode
> 100644
> target/linux/oxnas/patches-3.18/010-arm_introduce-dma-fiq-irq-broadcast.patch
>
> 
create mode 100644
target/linux/oxnas/patches-3.18/250-add-plxtech-vendor-prefix.patch
> create mode 100644
> target/linux/oxnas/patches-3.18/300-introduce-oxnas-platform.patch 
> create mode 100644
> target/linux/oxnas/patches-3.18/310-oxnas-clocksource.patch create
> mode 100644
> target/linux/oxnas/patches-3.18/320-oxnas-irqchip.patch create mode
> 100644 target/linux/oxnas/patches-3.18/330-oxnas-pinctrl.patch 
> create mode 100644
> target/linux/oxnas/patches-3.18/340-oxnas-pcie.patch create mode
> 100644 target/linux/oxnas/patches-3.18/350-oxnas-reset.patch create
> mode 100644 target/linux/oxnas/patches-3.18/400-oxnas-nand.patch 
> create mode 100644
> target/linux/oxnas/patches-3.18/500-oxnas-sata.patch create mode
> 100644 target/linux/oxnas/patches-3.18/800-oxnas-ehci.patch create
> mode 100644 target/linux/oxnas/patches-3.18/900-more-boards.patch 
> create mode 100644 target/linux/oxnas/profiles/100-Generic.mk
> 
_______________________________________________
openwrt-devel mailing list
openwrt-devel at lists.openwrt.org
https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel



More information about the openwrt-devel mailing list