From patchwork Wed Jun 21 08:12:00 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ludovic Desroches X-Patchwork-Id: 778707 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from hemlock.osuosl.org (smtp2.osuosl.org [140.211.166.133]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 3wsyPR1zlsz9s72 for ; Wed, 21 Jun 2017 18:22:18 +1000 (AEST) Received: from localhost (localhost [127.0.0.1]) by hemlock.osuosl.org (Postfix) with ESMTP id B7F6687E79; Wed, 21 Jun 2017 08:22:16 +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 ypAB31wf250w; Wed, 21 Jun 2017 08:22:15 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by hemlock.osuosl.org (Postfix) with ESMTP id 9A7D587E07; Wed, 21 Jun 2017 08:22:15 +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 4C61D1C26D0 for ; Wed, 21 Jun 2017 08:22:14 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id 44A2D267D9 for ; Wed, 21 Jun 2017 08:22:14 +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 arhT8wlWIlmd for ; Wed, 21 Jun 2017 08:22:13 +0000 (UTC) X-Greylist: delayed 00:09:22 by SQLgrey-1.7.6 Received: from esa5.microchip.iphmx.com (esa5.microchip.iphmx.com [216.71.150.166]) by silver.osuosl.org (Postfix) with ESMTPS id 53FF722D8D for ; Wed, 21 Jun 2017 08:22:13 +0000 (UTC) X-IronPort-AV: E=Sophos;i="5.39,368,1493708400"; d="scan'208";a="1587223" Received: from smtpout.microchip.com (HELO email.microchip.com) ([198.175.253.82]) by esa5.microchip.iphmx.com with ESMTP/TLS/DHE-RSA-AES256-SHA; 21 Jun 2017 01:12:53 -0700 Received: from ibiza.rfo.atmel.com (10.10.76.4) by chn-sv-exch07.mchp-main.com (10.10.76.108) with Microsoft SMTP Server id 14.3.352.0; Wed, 21 Jun 2017 01:12:50 -0700 From: Ludovic Desroches To: Date: Wed, 21 Jun 2017 10:12:00 +0200 Message-ID: <20170621081201.7717-2-ludovic.desroches@microchip.com> X-Mailer: git-send-email 2.12.2 In-Reply-To: <20170621081201.7717-1-ludovic.desroches@microchip.com> References: <20170621081201.7717-1-ludovic.desroches@microchip.com> MIME-Version: 1.0 Cc: Ludovic Desroches , joshua.henderson@microchip.com, nicolas.ferre@microchip.com Subject: [Buildroot] [PATCH 2/3] board/atmel: provide u-boot env for at91sam9x5ek_mmc X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Default bootargs have changed in U-Boot for this board. Build U-Boot environment and add it to the SD card image to update bootargs. Signed-off-by: Ludovic Desroches --- board/atmel/at91sam9x5ek_mmc/genimage.cfg | 4 ++++ board/atmel/at91sam9x5ek_mmc/uboot-env.txt | 7 +++++++ configs/at91sam9x5ek_mmc_defconfig | 3 +++ configs/at91sam9x5ek_mmc_dev_defconfig | 3 +++ 4 files changed, 17 insertions(+) create mode 100644 board/atmel/at91sam9x5ek_mmc/uboot-env.txt diff --git a/board/atmel/at91sam9x5ek_mmc/genimage.cfg b/board/atmel/at91sam9x5ek_mmc/genimage.cfg index b2be647d8b..7a552665f3 100644 --- a/board/atmel/at91sam9x5ek_mmc/genimage.cfg +++ b/board/atmel/at91sam9x5ek_mmc/genimage.cfg @@ -12,6 +12,10 @@ image boot.vfat { "boot.bin", "u-boot.bin" } + + file uboot.env { + image = "uboot-env.bin" + } } size = 16M } diff --git a/board/atmel/at91sam9x5ek_mmc/uboot-env.txt b/board/atmel/at91sam9x5ek_mmc/uboot-env.txt new file mode 100644 index 0000000000..568e4bc985 --- /dev/null +++ b/board/atmel/at91sam9x5ek_mmc/uboot-env.txt @@ -0,0 +1,7 @@ +bootargs=console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait video=Unknown-1:800x480-16 +bootcmd=fatload mmc 0:1 0x21000000 at91sam9g35ek.dtb; fatload mmc 0:1 0x22000000 zImage; bootz 0x22000000 - 0x21000000 +bootdelay=1 +ethact=gmac0 +stderr=serial +stdin=serial +stdout=serial diff --git a/configs/at91sam9x5ek_mmc_defconfig b/configs/at91sam9x5ek_mmc_defconfig index c1c4d67050..ed44943811 100644 --- a/configs/at91sam9x5ek_mmc_defconfig +++ b/configs/at91sam9x5ek_mmc_defconfig @@ -33,6 +33,9 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" +BR2_TARGET_UBOOT_ENVIMAGE=y +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image diff --git a/configs/at91sam9x5ek_mmc_dev_defconfig b/configs/at91sam9x5ek_mmc_dev_defconfig index 09482d2295..cd266d2e90 100644 --- a/configs/at91sam9x5ek_mmc_dev_defconfig +++ b/configs/at91sam9x5ek_mmc_dev_defconfig @@ -95,6 +95,9 @@ BR2_TARGET_UBOOT_CUSTOM_GIT=y BR2_TARGET_UBOOT_CUSTOM_REPO_URL="https://github.com/linux4sam/u-boot-at91.git" BR2_TARGET_UBOOT_CUSTOM_REPO_VERSION="linux4sam_5.5" BR2_TARGET_UBOOT_BOARD_DEFCONFIG="at91sam9x5ek_mmc" +BR2_TARGET_UBOOT_ENVIMAGE=y +BR2_TARGET_UBOOT_ENVIMAGE_SOURCE="board/atmel/at91sam9x5ek_mmc/uboot-env.txt" +BR2_TARGET_UBOOT_ENVIMAGE_SIZE="0x4000" # Host packages # Needed to generate the SD card image