| Message ID | ad063dad0d9c6d469d1e809b5e925a950bac712b.1658919469.git.yann.morin.1998@free.fr |
|---|---|
| State | Accepted |
| Headers | show |
| Series | arch/cskey: remove (branch csky-in-the-sky) | expand |
Hello Yann, Le 27/07/2022 à 12:58, Yann E. MORIN a écrit : Fixes: https://gitlab.com/buildroot.org/buildroot/-/jobs/2750359289 Best regards, Romain > Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> > Cc: Guo Ren <ren_guo@c-sky.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> > --- > DEVELOPERS | 4 - > board/csky/gx6605s/gdbinit | 25 ------ > board/csky/gx6605s/gx6605s.dts | 155 --------------------------------- > board/csky/readme.txt | 88 ------------------- > configs/csky_gx6605s_defconfig | 19 ---- > 5 files changed, 291 deletions(-) > delete mode 100644 board/csky/gx6605s/gdbinit > delete mode 100644 board/csky/gx6605s/gx6605s.dts > delete mode 100644 board/csky/readme.txt > delete mode 100644 configs/csky_gx6605s_defconfig > > diff --git a/DEVELOPERS b/DEVELOPERS > index 04c9588f34..7747cefa0d 100644 > --- a/DEVELOPERS > +++ b/DEVELOPERS > @@ -1181,10 +1181,6 @@ F: support/testing/tests/package/br2-external/python-pybind > F: support/testing/tests/package/sample_python_pybind.py > F: support/testing/tests/package/test_python_pybind.py > > -N: Guo Ren <ren_guo@c-sky.com> > -F: board/csky/ > -F: configs/csky_* > - > N: Gustavo Heinz <gustavo@gsthnz.com> > F: package/python-m2crypto/ > > diff --git a/board/csky/gx6605s/gdbinit b/board/csky/gx6605s/gdbinit > deleted file mode 100644 > index d602aad46d..0000000000 > --- a/board/csky/gx6605s/gdbinit > +++ /dev/null > @@ -1,25 +0,0 @@ > -tar jtag jtag://127.0.0.1:1025 > -reset > - > -# setup CCR (Cache Config Reg) > -# 0-1:MP,2:IE,3:DE,4:WB,5:RS,6:Z,7:BE > -set $cr18 = 0x7d > - > -# vendor custom setup, double cache line & preload > -set $cr30 = 0xc > - > -# pin mux for serial8250 > -set *(unsigned int *) 0xa030a14c |= (1 << 22) | (1 << 23) > - > -# pass devicetree blob > -# r2 is magic > -# r3 is address > -set $r2 = 0x20150401 > -set $r3 = 0x92000000 > -restore gx6605s.dtb binary 0x92000000 > - > -# flush cache > -set $cr17 = 0x33 > - > -load > - > diff --git a/board/csky/gx6605s/gx6605s.dts b/board/csky/gx6605s/gx6605s.dts > deleted file mode 100644 > index e4d46f59a0..0000000000 > --- a/board/csky/gx6605s/gx6605s.dts > +++ /dev/null > @@ -1,155 +0,0 @@ > -/dts-v1/; > -#include <dt-bindings/gpio/gpio.h> > -#include <dt-bindings/input/input.h> > - > -/ { > - model = "C-SKY gx6605s"; > - compatible = "csky,gx6605s"; > - #address-cells = <1>; > - #size-cells = <1>; > - > - memory { > - device_type = "memory"; > - reg = <0x10000000 0x04000000>; > - }; > - > - soc { > - #address-cells = <1>; > - #size-cells = <1>; > - compatible = "simple-bus"; > - ranges; > - > - dummy_apb: apb-clock { > - compatible = "fixed-clock"; > - clock-frequency = <27000000>; > - clock-output-names = "dummy_apb"; > - #clock-cells = <0>; > - }; > - > - intc: interrupt-controller@500000 { > - compatible = "csky,gx6605s-intc"; > - reg = <0x00500000 0x400>; > - interrupt-controller; > - #interrupt-cells = <1>; > - }; > - > - timer@20a000 { > - compatible = "csky,gx6605s-timer"; > - reg = <0x0020a000 0x400>; > - clocks = <&dummy_apb>; > - interrupts = <10>; > - interrupt-parent = <&intc>; > - }; > - > - ehci-hcd@900000 { > - compatible = "generic-ehci"; > - reg = <0x00900000 0x400>; > - interrupt-parent = <&intc>; > - interrupts = <59>; > - }; > - > - ohci-hcd0@a00000 { > - compatible = "generic-ohci"; > - reg = <0x00a00000 0x400>; > - interrupt-parent = <&intc>; > - interrupts = <58>; > - }; > - > - ohci-hcd1@b00000 { > - compatible = "generic-ohci"; > - reg = <0x00b00000 0x400>; > - interrupt-parent = <&intc>; > - interrupts = <57>; > - }; > - > - serial@403000 { > - compatible = "ns16550a"; > - reg = <0x00403000 0x400>; > - interrupt-parent = <&intc>; > - interrupts = <15>; > - clock-frequency = <29491200>; > - baud = <115200>; > - reg-shift = <2>; > - reg-io-width = <1>; > - }; > - > - gpio0: gpio@305000 { > - compatible = "wd,mbl-gpio"; > - reg-names = "dirout", "dat", "set", "clr"; > - reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>; > - bgpio-base = <0>; > - #gpio-cells = <2>; > - gpio-controller; > - }; > - > - gpio_buttons { > - compatible = "gpio-keys-polled"; > - #address-cells = <1>; > - #size-cells = <0>; > - poll-interval = <100>; > - autorepeat; > - > - button0 { > - label = "button8"; > - linux,code = <KEY_LEFT>; > - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; > - }; > - > - button1 { > - label = "button6"; > - linux,code = <KEY_RIGHT>; > - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; > - }; > - > - button2 { > - label = "button5"; > - linux,code = <KEY_UP>; > - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; > - }; > - > - button3 { > - label = "button9"; > - linux,code = <KEY_DOWN>; > - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; > - }; > - > - button4 { > - label = "button7"; > - linux,code = <KEY_ENTER>; > - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; > - }; > - }; > - > - gpio_leds { > - compatible = "gpio-leds"; > - > - led0 { > - label = "led10"; > - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; > - linux,default-trigger = "heartbeat"; > - }; > - > - led1 { > - label = "led11"; > - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; > - linux,default-trigger = "timer"; > - }; > - > - led2 { > - label = "led12"; > - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; > - linux,default-trigger = "default-on"; > - }; > - > - led3 { > - label = "led13"; > - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; > - linux,default-trigger = "default-on"; > - }; > - }; > - }; > - > - chosen { > - bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait"; > - }; > -}; > diff --git a/board/csky/readme.txt b/board/csky/readme.txt > deleted file mode 100644 > index dc82dcc1d7..0000000000 > --- a/board/csky/readme.txt > +++ /dev/null > @@ -1,88 +0,0 @@ > -C-SKY Development Kit > - > -Intro > -===== > - > -C-SKY is a CPU Architecture from www.c-sky.com and has it own instruction set. > -Just like arm and mips in linux/arch, it named as 'csky'. > - > -gx6605s develop board is made by Hangzhou Nationalchip and C-SKY. > - > -Hardware Spec: > - * CPU: ck610 up to 594Mhz > - * Integrate with 64MB ddr2 in SOC. > - * Integrate with hardware Jtag. > - * Integrate with usb-to-serial chip. > - * USB ehci controller in SOC. > - * Power Supply: DC 5V from two micro-usb. > - > -How to build it > -=============== > - > -Configure Buildroot > -------------------- > - > -The csky_gx6605s_defconfig configuration is a sample configuration with > -all that is required to bring the gx6605s Development Board: > - > - $ make csky_gx6605s_defconfig > - > -Build everything > ----------------- > - > -Note: you will need to have access to the network, since Buildroot will > -download the packages' sources. > - > - $ make > - > -Result of the build > -------------------- > - > -After building, you should obtain this tree: > - > - output/images/ > - +-- vmlinux > - +-- rootfs.ext2 > - +-- <board name>.dtb > - > -How to run it > -============= > - > -Prepare Jtag-Server > -------------------- > - > - Download the Jtag-Server here: > - > - https://github.com/c-sky/tools/raw/master/DebugServerConsole-linux-x86_64-V4.2.00-20161213.tar.gz > - > - Go to the unpacked directory: > - > - $./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 > - > - Perhaps you need to use "sudo", which need libusb to detect c510:b210 > - > - $ sudo ./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 > - > -Prepare USB drive > ------------------ > - > - You sould determine which device associated to the usb drive > - carefully. eg: > - > - $ cat /proc/partitions > - 8 48 1971712 sdd > - 8 49 976720 sdd1 > - > - $ sudo dd if=rootfs.ext2 of=/dev/sdd1 > - $ sudo sync > - > -Run > ---- > - > - Plug the usb drive on gx6605s dev board. > - > - Setup the Console with the rate 115200/8-N-1. > - > - $ cd output/images > - $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux > - > diff --git a/configs/csky_gx6605s_defconfig b/configs/csky_gx6605s_defconfig > deleted file mode 100644 > index f1f9579dca..0000000000 > --- a/configs/csky_gx6605s_defconfig > +++ /dev/null > @@ -1,19 +0,0 @@ > -# Architecture > -BR2_csky=y > -BR2_ck610=y > - > -# System > -BR2_TARGET_ROOTFS_EXT2=y > -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" > - > -# Linux headers same as kernel, a 5.0 series > -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y > - > -# Kernel > -BR2_LINUX_KERNEL=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION=y > -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" > -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y > -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" > -BR2_LINUX_KERNEL_DTS_SUPPORT=y > -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts"
diff --git a/DEVELOPERS b/DEVELOPERS index 04c9588f34..7747cefa0d 100644 --- a/DEVELOPERS +++ b/DEVELOPERS @@ -1181,10 +1181,6 @@ F: support/testing/tests/package/br2-external/python-pybind F: support/testing/tests/package/sample_python_pybind.py F: support/testing/tests/package/test_python_pybind.py -N: Guo Ren <ren_guo@c-sky.com> -F: board/csky/ -F: configs/csky_* - N: Gustavo Heinz <gustavo@gsthnz.com> F: package/python-m2crypto/ diff --git a/board/csky/gx6605s/gdbinit b/board/csky/gx6605s/gdbinit deleted file mode 100644 index d602aad46d..0000000000 --- a/board/csky/gx6605s/gdbinit +++ /dev/null @@ -1,25 +0,0 @@ -tar jtag jtag://127.0.0.1:1025 -reset - -# setup CCR (Cache Config Reg) -# 0-1:MP,2:IE,3:DE,4:WB,5:RS,6:Z,7:BE -set $cr18 = 0x7d - -# vendor custom setup, double cache line & preload -set $cr30 = 0xc - -# pin mux for serial8250 -set *(unsigned int *) 0xa030a14c |= (1 << 22) | (1 << 23) - -# pass devicetree blob -# r2 is magic -# r3 is address -set $r2 = 0x20150401 -set $r3 = 0x92000000 -restore gx6605s.dtb binary 0x92000000 - -# flush cache -set $cr17 = 0x33 - -load - diff --git a/board/csky/gx6605s/gx6605s.dts b/board/csky/gx6605s/gx6605s.dts deleted file mode 100644 index e4d46f59a0..0000000000 --- a/board/csky/gx6605s/gx6605s.dts +++ /dev/null @@ -1,155 +0,0 @@ -/dts-v1/; -#include <dt-bindings/gpio/gpio.h> -#include <dt-bindings/input/input.h> - -/ { - model = "C-SKY gx6605s"; - compatible = "csky,gx6605s"; - #address-cells = <1>; - #size-cells = <1>; - - memory { - device_type = "memory"; - reg = <0x10000000 0x04000000>; - }; - - soc { - #address-cells = <1>; - #size-cells = <1>; - compatible = "simple-bus"; - ranges; - - dummy_apb: apb-clock { - compatible = "fixed-clock"; - clock-frequency = <27000000>; - clock-output-names = "dummy_apb"; - #clock-cells = <0>; - }; - - intc: interrupt-controller@500000 { - compatible = "csky,gx6605s-intc"; - reg = <0x00500000 0x400>; - interrupt-controller; - #interrupt-cells = <1>; - }; - - timer@20a000 { - compatible = "csky,gx6605s-timer"; - reg = <0x0020a000 0x400>; - clocks = <&dummy_apb>; - interrupts = <10>; - interrupt-parent = <&intc>; - }; - - ehci-hcd@900000 { - compatible = "generic-ehci"; - reg = <0x00900000 0x400>; - interrupt-parent = <&intc>; - interrupts = <59>; - }; - - ohci-hcd0@a00000 { - compatible = "generic-ohci"; - reg = <0x00a00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <58>; - }; - - ohci-hcd1@b00000 { - compatible = "generic-ohci"; - reg = <0x00b00000 0x400>; - interrupt-parent = <&intc>; - interrupts = <57>; - }; - - serial@403000 { - compatible = "ns16550a"; - reg = <0x00403000 0x400>; - interrupt-parent = <&intc>; - interrupts = <15>; - clock-frequency = <29491200>; - baud = <115200>; - reg-shift = <2>; - reg-io-width = <1>; - }; - - gpio0: gpio@305000 { - compatible = "wd,mbl-gpio"; - reg-names = "dirout", "dat", "set", "clr"; - reg = <0x305000 4>, <0x305004 4>, <0x305008 4>, <0x30500c 4>; - bgpio-base = <0>; - #gpio-cells = <2>; - gpio-controller; - }; - - gpio_buttons { - compatible = "gpio-keys-polled"; - #address-cells = <1>; - #size-cells = <0>; - poll-interval = <100>; - autorepeat; - - button0 { - label = "button8"; - linux,code = <KEY_LEFT>; - gpios = <&gpio0 8 GPIO_ACTIVE_LOW>; - }; - - button1 { - label = "button6"; - linux,code = <KEY_RIGHT>; - gpios = <&gpio0 6 GPIO_ACTIVE_LOW>; - }; - - button2 { - label = "button5"; - linux,code = <KEY_UP>; - gpios = <&gpio0 5 GPIO_ACTIVE_LOW>; - }; - - button3 { - label = "button9"; - linux,code = <KEY_DOWN>; - gpios = <&gpio0 9 GPIO_ACTIVE_LOW>; - }; - - button4 { - label = "button7"; - linux,code = <KEY_ENTER>; - gpios = <&gpio0 7 GPIO_ACTIVE_LOW>; - }; - }; - - gpio_leds { - compatible = "gpio-leds"; - - led0 { - label = "led10"; - gpios = <&gpio0 10 GPIO_ACTIVE_LOW>; - linux,default-trigger = "heartbeat"; - }; - - led1 { - label = "led11"; - gpios = <&gpio0 11 GPIO_ACTIVE_LOW>; - linux,default-trigger = "timer"; - }; - - led2 { - label = "led12"; - gpios = <&gpio0 12 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - - led3 { - label = "led13"; - gpios = <&gpio0 13 GPIO_ACTIVE_LOW>; - linux,default-trigger = "default-on"; - }; - }; - }; - - chosen { - bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda2 rw rootwait"; - }; -}; diff --git a/board/csky/readme.txt b/board/csky/readme.txt deleted file mode 100644 index dc82dcc1d7..0000000000 --- a/board/csky/readme.txt +++ /dev/null @@ -1,88 +0,0 @@ -C-SKY Development Kit - -Intro -===== - -C-SKY is a CPU Architecture from www.c-sky.com and has it own instruction set. -Just like arm and mips in linux/arch, it named as 'csky'. - -gx6605s develop board is made by Hangzhou Nationalchip and C-SKY. - -Hardware Spec: - * CPU: ck610 up to 594Mhz - * Integrate with 64MB ddr2 in SOC. - * Integrate with hardware Jtag. - * Integrate with usb-to-serial chip. - * USB ehci controller in SOC. - * Power Supply: DC 5V from two micro-usb. - -How to build it -=============== - -Configure Buildroot -------------------- - -The csky_gx6605s_defconfig configuration is a sample configuration with -all that is required to bring the gx6605s Development Board: - - $ make csky_gx6605s_defconfig - -Build everything ----------------- - -Note: you will need to have access to the network, since Buildroot will -download the packages' sources. - - $ make - -Result of the build -------------------- - -After building, you should obtain this tree: - - output/images/ - +-- vmlinux - +-- rootfs.ext2 - +-- <board name>.dtb - -How to run it -============= - -Prepare Jtag-Server -------------------- - - Download the Jtag-Server here: - - https://github.com/c-sky/tools/raw/master/DebugServerConsole-linux-x86_64-V4.2.00-20161213.tar.gz - - Go to the unpacked directory: - - $./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - - Perhaps you need to use "sudo", which need libusb to detect c510:b210 - - $ sudo ./DebugServerConsole -ddc -rstwait 1000 -prereset -port 1025 - -Prepare USB drive ------------------ - - You sould determine which device associated to the usb drive - carefully. eg: - - $ cat /proc/partitions - 8 48 1971712 sdd - 8 49 976720 sdd1 - - $ sudo dd if=rootfs.ext2 of=/dev/sdd1 - $ sudo sync - -Run ---- - - Plug the usb drive on gx6605s dev board. - - Setup the Console with the rate 115200/8-N-1. - - $ cd output/images - $ ../host/bin/csky-linux-gdb -x ../../board/csky/gx6605s/gdbinit vmlinux - diff --git a/configs/csky_gx6605s_defconfig b/configs/csky_gx6605s_defconfig deleted file mode 100644 index f1f9579dca..0000000000 --- a/configs/csky_gx6605s_defconfig +++ /dev/null @@ -1,19 +0,0 @@ -# Architecture -BR2_csky=y -BR2_ck610=y - -# System -BR2_TARGET_ROOTFS_EXT2=y -BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" - -# Linux headers same as kernel, a 5.0 series -BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y - -# Kernel -BR2_LINUX_KERNEL=y -BR2_LINUX_KERNEL_CUSTOM_VERSION=y -BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.0.12" -BR2_LINUX_KERNEL_USE_ARCH_DEFAULT_CONFIG=y -BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/qemu/csky/linux-ck610.config.fragment" -BR2_LINUX_KERNEL_DTS_SUPPORT=y -BR2_LINUX_KERNEL_CUSTOM_DTS_PATH="board/csky/gx6605s/gx6605s.dts"
Signed-off-by: Yann E. MORIN <yann.morin.1998@free.fr> Cc: Guo Ren <ren_guo@c-sky.com> Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Cc: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> --- DEVELOPERS | 4 - board/csky/gx6605s/gdbinit | 25 ------ board/csky/gx6605s/gx6605s.dts | 155 --------------------------------- board/csky/readme.txt | 88 ------------------- configs/csky_gx6605s_defconfig | 19 ---- 5 files changed, 291 deletions(-) delete mode 100644 board/csky/gx6605s/gdbinit delete mode 100644 board/csky/gx6605s/gx6605s.dts delete mode 100644 board/csky/readme.txt delete mode 100644 configs/csky_gx6605s_defconfig