| Message ID | 1559468510-22085-1-git-send-email-guoren@kernel.org |
|---|---|
| State | Changes Requested |
| Headers | show |
| Series | [V5,1/2] configs/qemu_cskyXXX_virt: new defconfig | expand |
Hello Guo, On Sun, 2 Jun 2019 17:41:49 +0800 guoren@kernel.org wrote: > From: Guo Ren <ren_guo@c-sky.com> > > Add C-SKY defconfig for QEMU virt machine. > > Tested with https://gitlab.com/c-sky/buildroot/pipelines > > Signed-off-by: Guo Ren <ren_guo@c-sky.com> > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> Thanks, it looks a lot better, but there are still a few things to improve. First, the readme.txt file should be in the same patch. Second, you should update the DEVELOPES file so that it covers those additional files (board/qemu/csky and configs/qemu_csky*). See below for other comments. > diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment > new file mode 100644 > index 0000000..d80d0ee > --- /dev/null > +++ b/board/qemu/csky/linux-ck610.config.fragment > @@ -0,0 +1,5 @@ > +CONFIG_COMPILE_TEST=y > +CONFIG_CPU_CK610=y > +CONFIG_CPU_PM_WAIT=y > +CONFIG_CSKY_APB_INTC=y > +CONFIG_GX6605S_TIMER=y Thanks, this is _much_ better! > diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig > new file mode 100644 > index 0000000..9a82d57 > --- /dev/null > +++ b/configs/qemu_csky610_virt_defconfig > @@ -0,0 +1,20 @@ > +# Architecture > +BR2_csky=y > +BR2_ck610=y You need to add an option like this: # Linux headers same as kernel, a 5.0 series BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y > +# System > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y Please don't enable mdev. > +BR2_TARGET_ROOTFS_INITRAMFS=y > + > +# Toolchain > +BR2_OPTIMIZE_2=y > +BR2_SHARED_STATIC_LIBS=y > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > +BR2_PACKAGE_HOST_GDB=y Please remove those options. > +# 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" And of course, it should be changed similarly in all other defconfigs. Thanks, Thomas
Hello Thomas, On Sun, Jun 2, 2019 at 6:32 PM Thomas Petazzoni <thomas.petazzoni@bootlin.com> wrote: > > From: Guo Ren <ren_guo@c-sky.com> > > > > Add C-SKY defconfig for QEMU virt machine. > > > > Tested with https://gitlab.com/c-sky/buildroot/pipelines > > > > Signed-off-by: Guo Ren <ren_guo@c-sky.com> > > Cc: Thomas Petazzoni <thomas.petazzoni@bootlin.com> > > Thanks, it looks a lot better, but there are still a few things to > improve. > > First, the readme.txt file should be in the same patch. Ok. > > Second, you should update the DEVELOPES file so that it covers those > additional files (board/qemu/csky and configs/qemu_csky*). Ok, it'll be another patch. > > See below for other comments. > > > > diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment > > new file mode 100644 > > index 0000000..d80d0ee > > --- /dev/null > > +++ b/board/qemu/csky/linux-ck610.config.fragment > > @@ -0,0 +1,5 @@ > > +CONFIG_COMPILE_TEST=y > > +CONFIG_CPU_CK610=y > > +CONFIG_CPU_PM_WAIT=y > > +CONFIG_CSKY_APB_INTC=y > > +CONFIG_GX6605S_TIMER=y > > Thanks, this is _much_ better! > > > diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig > > new file mode 100644 > > index 0000000..9a82d57 > > --- /dev/null > > +++ b/configs/qemu_csky610_virt_defconfig > > @@ -0,0 +1,20 @@ > > +# Architecture > > +BR2_csky=y > > +BR2_ck610=y > > You need to add an option like this: > > # Linux headers same as kernel, a 5.0 series > BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_0=y Ok. > > > +# System > > +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y > > Please don't enable mdev. Ok, I'll use BR2_ROOTFS_DEVICE_CREATION_STATIC=y. > > > +BR2_TARGET_ROOTFS_INITRAMFS=y > > + > > +# Toolchain > > +BR2_OPTIMIZE_2=y > > +BR2_SHARED_STATIC_LIBS=y > > +BR2_TOOLCHAIN_BUILDROOT_CXX=y > > +BR2_PACKAGE_HOST_GDB=y > > Please remove those options. OK. > > > +# 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" > > And of course, it should be changed similarly in all other defconfigs. OK. Best Regards Guo Ren
Hello Guo, On Mon, 3 Jun 2019 15:00:12 +0800 Guo Ren <guoren@kernel.org> wrote: > > Second, you should update the DEVELOPES file so that it covers those > > additional files (board/qemu/csky and configs/qemu_csky*). > Ok, it'll be another patch. No, it should be in the same patch. Thanks! Thomas
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 374dbfe..4fa3473 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -248,6 +248,10 @@ qemu_aarch64_virt_defconfig: { extends: .defconfig } qemu_arm_versatile_defconfig: { extends: .defconfig } qemu_arm_versatile_nommu_defconfig: { extends: .defconfig } qemu_arm_vexpress_defconfig: { extends: .defconfig } +qemu_csky610_virt_defconfig: { extends: .defconfig } +qemu_csky807_virt_defconfig: { extends: .defconfig } +qemu_csky810_virt_defconfig: { extends: .defconfig } +qemu_csky860_virt_defconfig: { extends: .defconfig } qemu_m68k_mcf5208_defconfig: { extends: .defconfig } qemu_m68k_q800_defconfig: { extends: .defconfig } qemu_microblazebe_mmu_defconfig: { extends: .defconfig } diff --git a/board/qemu/csky/linux-ck610.config.fragment b/board/qemu/csky/linux-ck610.config.fragment new file mode 100644 index 0000000..d80d0ee --- /dev/null +++ b/board/qemu/csky/linux-ck610.config.fragment @@ -0,0 +1,5 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK610=y +CONFIG_CPU_PM_WAIT=y +CONFIG_CSKY_APB_INTC=y +CONFIG_GX6605S_TIMER=y diff --git a/board/qemu/csky/linux-ck807.config.fragment b/board/qemu/csky/linux-ck807.config.fragment new file mode 100644 index 0000000..b6974f0 --- /dev/null +++ b/board/qemu/csky/linux-ck807.config.fragment @@ -0,0 +1,5 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK807=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck810.config.fragment b/board/qemu/csky/linux-ck810.config.fragment new file mode 100644 index 0000000..50fa1f4 --- /dev/null +++ b/board/qemu/csky/linux-ck810.config.fragment @@ -0,0 +1,5 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK810=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_CSKY_APB_INTC=y diff --git a/board/qemu/csky/linux-ck860.config.fragment b/board/qemu/csky/linux-ck860.config.fragment new file mode 100644 index 0000000..e8f6af1 --- /dev/null +++ b/board/qemu/csky/linux-ck860.config.fragment @@ -0,0 +1,9 @@ +CONFIG_COMPILE_TEST=y +CONFIG_CPU_CK860=y +# CONFIG_CPU_HAS_FPU is not set +CONFIG_CPU_PM_WAIT=y +CONFIG_SMP=y +CONFIG_HOTPLUG_CPU=y +CONFIG_CSKY_APB_INTC=y +CONFIG_CSKY_MPINTC=y +CONFIG_CSKY_MP_TIMER=y diff --git a/configs/qemu_csky610_virt_defconfig b/configs/qemu_csky610_virt_defconfig new file mode 100644 index 0000000..9a82d57 --- /dev/null +++ b/configs/qemu_csky610_virt_defconfig @@ -0,0 +1,20 @@ +# Architecture +BR2_csky=y +BR2_ck610=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Toolchain +BR2_OPTIMIZE_2=y +BR2_SHARED_STATIC_LIBS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_PACKAGE_HOST_GDB=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" diff --git a/configs/qemu_csky807_virt_defconfig b/configs/qemu_csky807_virt_defconfig new file mode 100644 index 0000000..8fe32e8 --- /dev/null +++ b/configs/qemu_csky807_virt_defconfig @@ -0,0 +1,21 @@ +# Architecture +BR2_csky=y +BR2_ck807=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Toolchain +BR2_OPTIMIZE_2=y +BR2_SHARED_STATIC_LIBS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_PACKAGE_HOST_GDB=y +BR2_TARGET_OPTIMIZATION="-mbacktrace" + +# 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-ck807.config.fragment" diff --git a/configs/qemu_csky810_virt_defconfig b/configs/qemu_csky810_virt_defconfig new file mode 100644 index 0000000..8fe3a0c --- /dev/null +++ b/configs/qemu_csky810_virt_defconfig @@ -0,0 +1,21 @@ +# Architecture +BR2_csky=y +BR2_ck810=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Toolchain +BR2_OPTIMIZE_2=y +BR2_SHARED_STATIC_LIBS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_PACKAGE_HOST_GDB=y +BR2_TARGET_OPTIMIZATION="-mbacktrace" + +# 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-ck810.config.fragment" diff --git a/configs/qemu_csky860_virt_defconfig b/configs/qemu_csky860_virt_defconfig new file mode 100644 index 0000000..02408ad --- /dev/null +++ b/configs/qemu_csky860_virt_defconfig @@ -0,0 +1,21 @@ +# Architecture +BR2_csky=y +BR2_ck860=y + +# System +BR2_ROOTFS_DEVICE_CREATION_DYNAMIC_MDEV=y +BR2_TARGET_ROOTFS_INITRAMFS=y + +# Toolchain +BR2_OPTIMIZE_2=y +BR2_SHARED_STATIC_LIBS=y +BR2_TOOLCHAIN_BUILDROOT_CXX=y +BR2_PACKAGE_HOST_GDB=y +BR2_TARGET_OPTIMIZATION="-mbacktrace" + +# 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-ck860.config.fragment"