From patchwork Thu Mar 20 22:13:00 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Dennis Gilmore X-Patchwork-Id: 332411 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from theia.denx.de (theia.denx.de [85.214.87.163]) by ozlabs.org (Postfix) with ESMTP id 946C52C007E for ; Fri, 21 Mar 2014 09:13:56 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 908D44B5D2; Thu, 20 Mar 2014 23:13:48 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id OOJ0Qx3h-5og; Thu, 20 Mar 2014 23:13:48 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 57F334B5CB; Thu, 20 Mar 2014 23:13:40 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id DDA9A4B579 for ; Thu, 20 Mar 2014 23:13:34 +0100 (CET) X-Virus-Scanned: Debian amavisd-new at theia.denx.de Received: from theia.denx.de ([127.0.0.1]) by localhost (theia.denx.de [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id xl3VdqY8pJDE for ; Thu, 20 Mar 2014 23:13:30 +0100 (CET) X-policyd-weight: NOT_IN_SBL_XBL_SPAMHAUS=-1.5 NOT_IN_SPAMCOP=-1.5 NOT_IN_BL_NJABL=-1.5 (only DNSBL check requested) Received: from mail.ausil.us (mail02.ausil.us [74.119.218.151]) by theia.denx.de (Postfix) with ESMTP id 31DA94B14B for ; Thu, 20 Mar 2014 23:13:27 +0100 (CET) Received: from localhost (unknown [127.0.0.1]) by mail.ausil.us (Postfix) with ESMTP id 988572E0025; Thu, 20 Mar 2014 22:13:24 +0000 (UTC) X-Virus-Scanned: amavisd-new at ausil.us Received: from mail.ausil.us ([127.0.0.1]) by localhost (mail02.ausil.us [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id 4PJlBBzw76P3; Thu, 20 Mar 2014 22:13:22 +0000 (GMT) Received: from adria.ausil.us (osiris.ausil.us [75.149.73.105]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-SHA256 (128/128 bits)) (No client certificate requested) by mail.ausil.us (Postfix) with ESMTPSA id 1BF962E01FA; Thu, 20 Mar 2014 22:13:19 +0000 (GMT) From: Dennis Gilmore To: u-boot@lists.denx.de Date: Thu, 20 Mar 2014 17:13:00 -0500 Message-Id: <1395353581-5839-6-git-send-email-dennis@ausil.us> X-Mailer: git-send-email 1.9.0 In-Reply-To: <1395353581-5839-1-git-send-email-dennis@ausil.us> References: <1392659798-1665-1-git-send-email-dennis@ausil.us> <1395353581-5839-1-git-send-email-dennis@ausil.us> Cc: Fabio Estevam , Marek Vasut , Stephen Warren , Otavio Salvador , Dennis Gilmore , Jon Nettleton , Tom Rini Subject: [U-Boot] [PATCH 5/6] move pandaboard over to use the generic distro configuation and environment X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.11 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: u-boot-bounces@lists.denx.de Errors-To: u-boot-bounces@lists.denx.de port pandaboard to use the generic distro configuation. remove duplicated config options, clean up the environment, include new environment. Signed-off-by: Dennis Gilmore --- include/configs/omap4_panda.h | 2 -- include/configs/ti_omap4_common.h | 37 +++++++++++-------------------------- 2 files changed, 11 insertions(+), 28 deletions(-) diff --git a/include/configs/omap4_panda.h b/include/configs/omap4_panda.h index 7378acd..1b81a24 100644 --- a/include/configs/omap4_panda.h +++ b/include/configs/omap4_panda.h @@ -33,8 +33,6 @@ #define CONFIG_UBOOT_ENABLE_PADS_ALL -#define CONFIG_CMD_PING -#define CONFIG_CMD_DHCP #include #define CONFIG_CMD_NET diff --git a/include/configs/ti_omap4_common.h b/include/configs/ti_omap4_common.h index 387f570..f9baa50 100644 --- a/include/configs/ti_omap4_common.h +++ b/include/configs/ti_omap4_common.h @@ -86,6 +86,7 @@ /* * Environment setup */ +#ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "console=ttyO2,115200n8\0" \ @@ -102,16 +103,16 @@ "vram=${vram} " \ "root=${mmcroot} " \ "rootfstype=${mmcrootfstype}\0" \ - "loadbootscript=fatload mmc ${mmcdev} ${loadaddr} boot.scr\0" \ + "loadbootscript=load mmc ${mmcdev} ${kernel_addr_r} boot.scr\0" \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ - "source ${loadaddr}\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \ + "source ${kernel_addr_r}\0" \ + "loadbootenv=load mmc ${mmcdev} ${kernel_addr_r} uEnv.txt\0" \ "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ - "env import -t ${loadaddr} ${filesize}\0" \ - "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "env import -t ${kernel_addr_r} ${filesize}\0" \ + "loadimage=load mmc ${bootpart} ${kernel_addr_r} ${bootdir}/${bootfile}\0" \ "mmcboot=echo Booting from mmc${mmcdev} ...; " \ "run mmcargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ + "bootz ${kernel_addr_r} - ${fdt_addr_r}\0" \ "findfdt="\ "if test $board_name = sdp4430; then " \ "setenv fdtfile omap4-sdp.dtb; fi; " \ @@ -123,29 +124,13 @@ "setenv fdtfile omap4-panda-es.dtb; fi;" \ "if test $fdtfile = undefined; then " \ "echo WARNING: Could not determine device tree to use; fi; \0" \ - "loadfdt=load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "loadfdt=load mmc ${bootpart} ${fdt_addr_r} ${bootdir}/${fdtfile}\0" \ + BOOTCMDS_COMMON +#endif #define CONFIG_BOOTCOMMAND \ "run findfdt; " \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadbootenv; then " \ - "run importbootenv; " \ - "fi;" \ - "if test -n ${uenvcmd}; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "fi;" \ - "if run loadimage; then " \ - "run loadfdt;" \ - "run mmcboot; " \ - "fi; " \ - "fi" - + "for target in ${boot_targets}; do run bootcmd_${target}; done " /* * Defines for SPL * It is known that this will break HS devices. Since the current size of