From patchwork Fri Mar 1 09:41:20 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: a.wlodarczyk@samsung.com X-Patchwork-Id: 224344 X-Patchwork-Delegate: promsoft@gmail.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 EB08B2C0094 for ; Sat, 2 Mar 2013 00:39:29 +1100 (EST) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id B32D74A0AD; Fri, 1 Mar 2013 14:39:26 +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 fy8zQJzbklGV; Fri, 1 Mar 2013 14:39:26 +0100 (CET) Received: from theia.denx.de (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 7F0584A0AF; Fri, 1 Mar 2013 14:39:22 +0100 (CET) Received: from localhost (localhost [127.0.0.1]) by theia.denx.de (Postfix) with ESMTP id 2E3634A02E for ; Fri, 1 Mar 2013 10:42:38 +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 L3PbVnZdzIEE for ; Fri, 1 Mar 2013 10:42:36 +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 mailout1.samsung.com (mailout1.samsung.com [203.254.224.24]) by theia.denx.de (Postfix) with ESMTP id 36E864A02D for ; Fri, 1 Mar 2013 10:42:34 +0100 (CET) Received: from epcpsbgm1.samsung.com (epcpsbgm1 [203.254.230.26]) by mailout1.samsung.com (Oracle Communications Messaging Server 7u4-24.01(7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTP id <0MIZ00MWA6YUSKK0@mailout1.samsung.com> for u-boot@lists.denx.de; Fri, 01 Mar 2013 18:42:30 +0900 (KST) X-AuditID: cbfee61a-b7f7d6d000000f4e-e6-51307805d4ea Received: from epmmp2 ( [203.254.227.17]) by epcpsbgm1.samsung.com (EPCPMTA) with SMTP id F6.14.03918.50870315; Fri, 01 Mar 2013 18:42:29 +0900 (KST) Received: from mcdsrvbld02.digital.local ([106.116.37.23]) by mmp2.samsung.com (Oracle Communications Messaging Server 7u4-24.01 (7.0.4.24.0) 64bit (built Nov 17 2011)) with ESMTPA id <0MIZ00HOP6YJBA30@mmp2.samsung.com>; Fri, 01 Mar 2013 18:42:29 +0900 (KST) From: Arek Wlodarczyk To: u-boot@lists.denx.de Date: Fri, 01 Mar 2013 10:41:20 +0100 Message-id: <1362130880-9931-1-git-send-email-a.wlodarczyk@samsung.com> X-Mailer: git-send-email 1.7.10 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFnrKJMWRmVeSWpSXmKPExsVy+t9jQV3WCoNAgzMzrC3u/etnsjjb9Ibd 4s3DzYwWHUdaGC3e7u1kd2D1OHtnB6NH35ZVjAFMUVw2Kak5mWWpRfp2CVwZU/c+YC94Jlbx df999gbGk0JdjJwcEgImEt9mvWGCsMUkLtxbz9bFyMUhJDCdUWLzzs+sEE4Xk8SUdQ0sIFVs AgYSL19cA7NFBCQkfvVfZQQpYhaYwyjx+eh2ZpCEsEC8xKeVIN2cHCwCqhJHt8xiBLF5Bdwl Vm7sY4RYJy/x9H4f2wRG7gWMDKsYRVMLkguKk9JzDfWKE3OLS/PS9ZLzczcxgj3/TGoH48oG i0OMAhyMSjy8K2v0A4VYE8uKK3MPMUpwMCuJ8Fa+AQrxpiRWVqUW5ccXleakFh9ilOZgURLn ZTz1JEBIID2xJDU7NbUgtQgmy8TBKdXAONemit/j6hsjoWmrzy89dfhMwtb2766NNSX1hnNt 71g6JKforQwRY+XVs/m1in9P4dOVrx7tvJgbeMOKq0xxWbeTqAn7LTOban7ro7tviUVqc021 UL7nutdAWInjW/DElDda0ZtZnDbMCvvL6p96NzbB93viMh4VrmtzixfOaPe7zDJH+9FqJZbi jERDLeai4kQAxFZM0vgBAAA= X-Mailman-Approved-At: Fri, 01 Mar 2013 14:39:21 +0100 Cc: Kyungmin Park , Arkadiusz Wlodarczyk Subject: [U-Boot] [PATCH] arm:trats: change auto-booting to boot kernel with separate device tree blob 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 From: Arkadiusz Wlodarczyk Signed-off-by: Arkadiusz Wlodarczyk Signed-off-by: Kyungmin Park Tested-by: Arkadiusz Wlodarczyk Cc: Minkyu Kang --- Changes: Modify autoboot scripts that are included in environment variables of default environment in order to load device tree to memory prior to booting and to pass device tree address to mboot command. Switch on dft library, that is necessary for mboot command to pass the device tree address in memory to kernel. Added device tree file entry in DFU items table in order to facilitate uploading the device tree blob file on a target. --- include/configs/trats.h | 16 ++++++++++++---- 1 files changed, 12 insertions(+), 4 deletions(-) diff --git a/include/configs/trats.h b/include/configs/trats.h index 63745ac..d82a7ba 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -146,7 +146,8 @@ #define CONFIG_DFU_ALT \ "u-boot mmc 80 400;" \ - "uImage ext4 0 2\0" \ + "uImage ext4 0 2;" \ + "exynos4210-trats.dtb ext4 0 2\0" #define CONFIG_ENV_OVERWRITE #define CONFIG_SYS_CONSOLE_INFO_QUIET @@ -154,7 +155,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootk=" \ - "run loaduimage; bootm 0x40007FC0\0" \ + "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \ "updatemmc=" \ "mmc boot 0 1 1 1; mmc write 0 0x42008000 0 0x200;" \ "mmc boot 0 1 1 0\0" \ @@ -177,7 +178,7 @@ "mmcboot=" \ "setenv bootargs root=/dev/mmcblk${mmcdev}p${mmcrootpart} " \ "${lpj} rootwait ${console} ${meminfo} ${opts} ${lcdinfo}; " \ - "run loaduimage; bootm 0x40007FC0\0" \ + "run loaddtb; run loaduimage; bootm 0x40007FC0 - ${fdtaddr}\0" \ "bootchart=setenv opts init=/sbin/bootchartd; run bootcmd\0" \ "boottrace=setenv opts initcall_debug; run bootcmd\0" \ "mmcoops=mmc read 0 0x40000000 0x40 8; md 0x40000000 0x400\0" \ @@ -188,6 +189,7 @@ "nfsroot=/nfsroot/arm\0" \ "bootblock=" CONFIG_BOOTBLOCK "\0" \ "loaduimage=ext4load mmc ${mmcdev}:${mmcbootpart} 0x40007FC0 uImage\0" \ + "loaddtb=ext4load mmc ${mmcdev}:${mmcbootpart} ${fdtaddr} ${fdtfile}\0" \ "mmcdev=0\0" \ "mmcbootpart=2\0" \ "mmcrootpart=5\0" \ @@ -211,7 +213,10 @@ " /${splfile} ${spl_imgaddr} ${spl_imgsize};" \ "setenv spl_imgsize;" \ "setenv spl_imgaddr;" \ - "setenv spl_addr_tmp;\0" + "setenv spl_addr_tmp;\0" \ + "fdtaddr=40800000\0" \ + "fdtfile=exynos4210-trats.dtb\0" + /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP /* undef to save memory */ @@ -316,4 +321,7 @@ #define CONFIG_VIDEO_BMP_GZIP #define CONFIG_SYS_VIDEO_LOGO_MAX_SIZE ((500 * 120 * 4) + (1 << 12)) +/* Pass open firmware flat tree */ +#define CONFIG_OF_LIBFDT 1 + #endif /* __CONFIG_H */