From patchwork Sat Dec 15 18:11:29 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Julien Olivain X-Patchwork-Id: 1013982 Return-Path: X-Original-To: incoming-buildroot@patchwork.ozlabs.org Delivered-To: patchwork-incoming-buildroot@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=busybox.net (client-ip=140.211.166.133; helo=hemlock.osuosl.org; envelope-from=buildroot-bounces@busybox.net; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=cotds.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 43HFqf4fWBz9s6w for ; Sun, 16 Dec 2018 05:11:58 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id 07E7F87AB2; Sat, 15 Dec 2018 18:11:57 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from hemlock.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 9yLo07frzf8T; Sat, 15 Dec 2018 18:11:56 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 394008798B; Sat, 15 Dec 2018 18:11:56 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ash.osuosl.org (Postfix) with ESMTP id D75DF1BF338 for ; Sat, 15 Dec 2018 18:11:54 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id D4A6B23600 for ; Sat, 15 Dec 2018 18:11:54 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id Bte96ngrfvih for ; Sat, 15 Dec 2018 18:11:53 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from mail.cotds.org (mail.cotds.org [194.117.244.136]) by silver.osuosl.org (Postfix) with ESMTP id 91AA923018 for ; Sat, 15 Dec 2018 18:11:53 +0000 (UTC) Received: from mail.cotds.org (mail.cotds.org [194.117.244.136]) by mail.cotds.org (Postfix) with ESMTP id E2EFBD1326B for ; Sat, 15 Dec 2018 19:11:51 +0100 (CET) X-Virus-Scanned: amavisd-new at mail.cotds.org Received: from mail.cotds.org ([194.117.244.136]) by mail.cotds.org (mail.cotds.org [194.117.244.136]) (amavisd-new, port 10024) with ESMTP id SWBySQWrn-cx for ; Sat, 15 Dec 2018 19:11:49 +0100 (CET) Received: from localhost.localdomain (unknown [78.230.101.148]) by mail.cotds.org (Postfix) with ESMTPSA id 578F9D12CED; Sat, 15 Dec 2018 19:11:46 +0100 (CET) From: Julien Olivain To: buildroot@buildroot.org Date: Sat, 15 Dec 2018 19:11:29 +0100 Message-Id: <20181215181129.9218-1-juju@cotds.org> X-Mailer: git-send-email 2.19.2 In-Reply-To: <20181211224312.25814-1-juju@cotds.org> References: <20181211224312.25814-1-juju@cotds.org> MIME-Version: 1.0 Subject: [Buildroot] [PATCH v2] csky_gx6605s_defconfig: bump gcc to 6.3.0, kernel to 4.9.56 X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.29 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Guo Ren Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" This patch updates the csky custom external toolchain to fix a broken host dependency of gdb on libexpat.so.0 (most hosts now ship libexpat.so.1). gdb is required to copy and and boot the kernel (see board/csky/readme.txt). The updated gdb does no longer have this host dependency, which solve the issue. Since this external toolchain was built and tested with csky kernel 4.9.56, this patch also update to that kernel version. Finally, this 4.9.56 csky kernel changed its default bootargs. So we add a patch to preserve the same behavior as the previous version. Signed-off-by: Julien Olivain --- Changes v1 -> v2: - explain why the update is needed in the commit log --- ...ine-for-serial-console-and-rootfs-on.patch | 25 +++++++++++++++++++ configs/csky_gx6605s_defconfig | 7 +++--- 2 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch diff --git a/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch b/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch new file mode 100644 index 0000000000..1da1a75400 --- /dev/null +++ b/board/csky/gx6605s/patches/linux/0001-csky-update-cmdline-for-serial-console-and-rootfs-on.patch @@ -0,0 +1,25 @@ +From 7e3f2c482bc16537a093e87a27f0d465804a88e4 Mon Sep 17 00:00:00 2001 +From: Julien Olivain +Date: Tue, 11 Dec 2018 23:04:46 +0100 +Subject: [PATCH] csky: update cmdline for serial console and rootfs on sda1 + +Signed-off-by: Julien Olivain +--- + arch/csky/boot/dts/gx6605s.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/arch/csky/boot/dts/gx6605s.dts b/arch/csky/boot/dts/gx6605s.dts +index ce56106af967..f5d60b21e6f9 100644 +--- a/arch/csky/boot/dts/gx6605s.dts ++++ b/arch/csky/boot/dts/gx6605s.dts +@@ -155,6 +155,6 @@ + }; + + chosen { +- bootargs = "console=tty0 init=/sbin/init root=/dev/sda2 rw rootwait"; ++ bootargs = "console=ttyS0,115200 init=/sbin/init root=/dev/sda1 rw rootwait"; + }; + }; +-- +2.19.2 + diff --git a/configs/csky_gx6605s_defconfig b/configs/csky_gx6605s_defconfig index 5f39c536ac..d0a2aadc6d 100644 --- a/configs/csky_gx6605s_defconfig +++ b/configs/csky_gx6605s_defconfig @@ -1,8 +1,9 @@ BR2_csky=y +BR2_GLOBAL_PATCH_DIR="board/csky/gx6605s/patches" BR2_TOOLCHAIN_EXTERNAL_DOWNLOAD=y -BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.2-20170227.tar.gz" +BR2_TOOLCHAIN_EXTERNAL_URL="https://github.com/c-sky/tools/raw/master/csky-linux-tools-x86_64-glibc-linux-4.9.56-20180128.tar.gz" BR2_TOOLCHAIN_EXTERNAL_CUSTOM_PREFIX="csky-linux" -BR2_TOOLCHAIN_EXTERNAL_GCC_4_5=y +BR2_TOOLCHAIN_EXTERNAL_GCC_6=y BR2_TOOLCHAIN_EXTERNAL_HEADERS_4_9=y BR2_TOOLCHAIN_EXTERNAL_CUSTOM_GLIBC=y BR2_TOOLCHAIN_EXTERNAL_CXX=y @@ -10,7 +11,7 @@ BR2_TOOLCHAIN_EXTERNAL_GDB_SERVER_COPY=y BR2_TARGET_GENERIC_GETTY_PORT="ttyS0" BR2_LINUX_KERNEL=y BR2_LINUX_KERNEL_CUSTOM_TARBALL=y -BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/314c498ddc8c43a66ca96ff3af7da98e10fa1cc6.tar.gz" +BR2_LINUX_KERNEL_CUSTOM_TARBALL_LOCATION="https://github.com/c-sky/linux-4.9.y/archive/6064a9bdf48cefbccc4f6472dd04251f0dec1931.tar.gz" BR2_LINUX_KERNEL_DEFCONFIG="gx66xx" BR2_LINUX_KERNEL_DTS_SUPPORT=y BR2_LINUX_KERNEL_INTREE_DTS_NAME="gx6605s"