From patchwork Sat Feb 24 14:09:40 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 877416 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="Grr5NcYp"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zpVPw2cqrz9sWH for ; Sun, 25 Feb 2018 01:11:32 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id D1684C22014; Sat, 24 Feb 2018 14:10:20 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H2, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 35295C22035; Sat, 24 Feb 2018 14:10:12 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id F2E7BC21FB1; Sat, 24 Feb 2018 14:10:05 +0000 (UTC) Received: from mail-io0-f195.google.com (mail-io0-f195.google.com [209.85.223.195]) by lists.denx.de (Postfix) with ESMTPS id 11F2FC21D56 for ; Sat, 24 Feb 2018 14:10:01 +0000 (UTC) Received: by mail-io0-f195.google.com with SMTP id q24so5432516ioh.8 for ; Sat, 24 Feb 2018 06:10:00 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=FlKSgfAkPZKWGbjv78NBAT3ArcKyHcUNLoGOf3ct+8I=; b=Grr5NcYpjv7xzf12TgnzBXFm23iX3qx44/kUAlsIegeY7c64qTBPLI4efPgKLt5LDD qrBsM3V5o9cb9YMRAADE1gWlcpUv5SdgvLyqiDyIlAA6MhwasujVarIouxExjvLLTV6U /PpLOsx8yTJoM/bSbcc+/UAMiwJhMRkRIWH6xzNaYIH/rvnM49c6XG0lldYShP3we+5J pK0d2ttSDfLocE42aljkxFoKVivxFZWazf883C4EMcjfHDCX2SX1xdTjCQsOPg5DzM8g 68Sth5ZK01jKOvM0j3vRatb9NVNd/KZOgIAfj7N83QEj/12Ep7SZqJqtawiZDPIKLSo8 FCgg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=FlKSgfAkPZKWGbjv78NBAT3ArcKyHcUNLoGOf3ct+8I=; b=ZgISZEDDGtT/EJHXdIzEiUHeegWFUQtMjvCxUbfpDrSYgLWoqVQN5jNjKJnklW2bBz ErK1yi5KbyP+YncaEQnGz780eGZ69WOzHfeCw/L5IbXU2jBknbOMuNZKyr0egMpRnwk9 DbJXFrOTeTspl/clR5Mobx2rdh2/O4faQlgUc1QEgbq0z3J1Mz7WWqGq9yKMg8F9IM+c oikQx2ZIcz4dpYDJJ3y6Ftmwn02WTGM9xFCzE1rBKzdv3W4bsWD1NphzrvPHzL1IXNXl 8OBbA71Y4HGwsYZXi/tOxO0e0601Im5mnVz3NdfZGxePFDuMwUfrRIA9VMAeLDeELssj Ax0w== X-Gm-Message-State: APf1xPCVs4wbfvcSVCOGyc4/4+FfXX0x8cBoTe29AOOcHe34fEuf/bRU gUwuNoQrUnF3P+GtizKyS+mkxQ== X-Google-Smtp-Source: AG47ELse/YivbmcZQ9nJ6GH/qq1rCakyhffEyRM3PeM/kNbIGbnKmWOpQyEt2qWyD8gUgXJ9s6nDJg== X-Received: by 10.107.38.80 with SMTP id m77mr5696481iom.69.1519481399613; Sat, 24 Feb 2018 06:09:59 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-74-196-48.hsd1.il.comcast.net. [73.74.196.48]) by smtp.gmail.com with ESMTPSA id z133sm2831355itb.2.2018.02.24.06.09.58 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 06:09:59 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 24 Feb 2018 08:09:40 -0600 Message-Id: <20180224140942.25332-2-woods.technical@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224140942.25332-1-woods.technical@gmail.com> References: <20180212051329.29761-1-woods.technical@gmail.com> <20180224140942.25332-1-woods.technical@gmail.com> Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v2 1/3] ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" BeagleBoard 'xM' does not really have NAND. CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT can/should be empty for 'xM'. This commit sets the defined values if they exist. Signed-off-by: Derald D. Woods --- board/ti/beagle/beagle.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c index d8402f2675..1d55264733 100644 --- a/board/ti/beagle/beagle.c +++ b/board/ti/beagle/beagle.c @@ -521,6 +521,14 @@ int misc_init_r(void) if (generate_fake_mac) omap_die_id_usbethaddr(); +#if defined(CONFIG_MTDIDS_DEFAULT) && defined(CONFIG_MTDPARTS_DEFAULT) + if (strlen(CONFIG_MTDIDS_DEFAULT)) + env_set("mtdids", CONFIG_MTDIDS_DEFAULT); + + if (strlen(CONFIG_MTDPARTS_DEFAULT)) + env_set("mtdparts", CONFIG_MTDPARTS_DEFAULT); +#endif + return 0; } From patchwork Sat Feb 24 14:09:41 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 877418 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="KVPI5vuI"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zpVQg57Gmz9sWH for ; Sun, 25 Feb 2018 01:12:11 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 412D5C22024; Sat, 24 Feb 2018 14:11:05 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 2B424C22024; Sat, 24 Feb 2018 14:10:40 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id 78FFFC2202C; Sat, 24 Feb 2018 14:10:08 +0000 (UTC) Received: from mail-it0-f68.google.com (mail-it0-f68.google.com [209.85.214.68]) by lists.denx.de (Postfix) with ESMTPS id 4C997C2202F for ; Sat, 24 Feb 2018 14:10:04 +0000 (UTC) Received: by mail-it0-f68.google.com with SMTP id j7so4956214ita.3 for ; Sat, 24 Feb 2018 06:10:04 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=ubB8QSG23a1vKGH0xKjuFiU4BiSD5EJzjfRX/kIVzaU=; b=KVPI5vuIys9miq+O3h+EDthPkmyY7TtnMAfiy5l3IqBmRkuy+rcchYzjaZzO79cLqW QNn5whQ6p6j5zFtZoR+CEkbSS7cX+FAyLkS/q0D4u7nf06tSbx7KeGbekKjM9Nxie0SF ldHVWPYpvF8F8ddbD5/t4A2EnUhP/ySXfIIxxQe6IlNg8BLR7Iivt9DquJKExhIcFfTG mYXZxiu3LcLF6uOc73xN+MoGst6gRxTTED2S6Ae3hQAZgB3PnUDKvgtcxYgGOFkNFNpD p6pzE2r5W+gYnQyMnkMNeUq8rei9iXCZzfjy8IkIGW75QqITbde0wGRvtEWp2tySWr9e jTmA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=ubB8QSG23a1vKGH0xKjuFiU4BiSD5EJzjfRX/kIVzaU=; b=czoCC5goVKmzzGR3yeByndV1JR5+L+ETGqkt9TDa+r16eX50Luihs99I5zH0+EMw/F BNu0knS5uM8jyyWAc3NmX0FY7/nv57eK7SKKpI0/emGc0qsN2c65qwonQTMHrA2BZ6Nu wCP8+LkZj4bLe7lgBLed2usr3jcy3qVpKWUDBIMKGF9kU8AnsgwPvok59WM1SYYIVyne Gkr1uwLJM7FZv3ZkP2aMQzYwBFs3BIKZ8bnJiqIZP/d8gaT0grgg6L1E+ST16bN2mcsp c6Rv3SwdYISAmLS9ufS1hVjkVVQRuZ2DtWjimOOLVe285ryNXXmC0APCC0wx+bJ0zYEw LELw== X-Gm-Message-State: APf1xPAJd8K44oMOYmsH0NYQejz6jUma3FhcT13CAfJxcSZLKFoDT1FF pj1pGU76DIFmCEnEEItd38bdaw== X-Google-Smtp-Source: AH8x2261oxMZLUpHGv1uslDm57fXF8nt14AKdFNZexh/in9yo8+R3ZbQp9z4c2VANpMdnsGmhb2eKw== X-Received: by 10.36.58.149 with SMTP id m143mr6285830itm.128.1519481402340; Sat, 24 Feb 2018 06:10:02 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-74-196-48.hsd1.il.comcast.net. [73.74.196.48]) by smtp.gmail.com with ESMTPSA id z133sm2831355itb.2.2018.02.24.06.10.01 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 06:10:01 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 24 Feb 2018 08:09:41 -0600 Message-Id: <20180224140942.25332-3-woods.technical@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224140942.25332-1-woods.technical@gmail.com> References: <20180212051329.29761-1-woods.technical@gmail.com> <20180224140942.25332-1-woods.technical@gmail.com> Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v2 2/3] ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit does the following for BeagleBoard{-xM}: - Enable DM_SERIAL which also enables SPL_DM_SERIAL - Misc. config updates in support of DM_SERIAL - Use CONFIG_ENV_IS_IN_FAT because BeagleBoard-xM has no NAND - Use updated NAND layout (BeagleBoard): device nand0 , # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 ------------------------------------------------- - Use MMC and UBIFS support from config_distro_bootcmd.h - Use LEGACY_MMC and NAND support defined in omap3_beagle.h [MMC(0:1)/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-fat label omap3-beagle-mmc-fat kernel /zImage fdt /omap3-beagle.dtb append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ---8<------------------------------------------------------------------- [LEGACY_MMC(0:2)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-ext4 label omap3-beagle-mmc-ext4 kernel /boot/zImage fdt /boot/omap3-beagle.dtb append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait ---8<------------------------------------------------------------------- [UBIFS(ubi0:rootfs)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-nand-ubifs label omap3-beagle-nand-ubifs kernel /boot/zImage fdt /boot/omap3-beagle.dtb append console=ttyO2,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs rootfstype=ubifs rootwait ---8<------------------------------------------------------------------- The board's 'bootcmd' can also be overridden with: CONFIG_BOOTCOMMAND="run findfdt; run mmcboot" CONFIG_BOOTCOMMAND="run findfdt; run nandboot" CONFIG_BOOTCOMMAND="run findfdt; run ramboot" or CONFIG_BOOTCOMMAND="run findfdt; run somethingelse" The use of 'run findfdt' is required. Signed-off-by: Derald D. Woods --- configs/omap3_beagle_defconfig | 29 +++-- include/configs/omap3_beagle.h | 239 +++++++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 113 deletions(-) -- v2: - 'config_distro_defaults.h' has been removed -- 2.16.2 diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index f0169a4544..51e1976899 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -4,32 +4,43 @@ CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle" CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y +# CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" +CONFIG_CMD_FS_UUID=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" +CONFIG_CMD_UBI=y +# CONFIG_ISO_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_SPL_DM=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1 @@ -45,11 +56,15 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y @@ -65,3 +80,5 @@ CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_FAT_WRITE=y CONFIG_BCH=y +CONFIG_SPL_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index ff4e601e55..85b83521e7 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -12,7 +12,7 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ +#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #include @@ -45,22 +45,17 @@ #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW #define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_SYS_ENV_SECT_SIZE SZ_128K #define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR 0x260000 #define CONFIG_ENV_OVERWRITE #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 #endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_NAND */ -/* MUSB */ -#define CONFIG_USB_OMAP3 - /* USB EHCI */ #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 @@ -73,88 +68,75 @@ /* TWL4030 LED Support */ #define CONFIG_TWL4030_LED +/* Environment */ +#define CONFIG_ENV_SIZE SZ_128K + +#define CONFIG_PREBOOT "usb start" + +#define MEM_LAYOUT_ENV_SETTINGS \ + DEFAULT_LINUX_BOOT_ENV + +#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "setenv mmcdev " #instance "; " \ + "run mmcboot\0" +#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ + #devtypel #instance " " + +#if defined(CONFIG_NAND) + +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "if test ${mtdids} = '' || test ${mtdparts} = '' ; then " \ + "echo NAND boot disabled: No mtdids and/or mtdparts; " \ + "else " \ + "run nandboot; " \ + "fi\0" +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " + #define BOOT_TARGET_DEVICES(func) \ - func(MMC, mmc, 0) - -#define CONFIG_BOOTCOMMAND \ - "run findfdt; " \ - "run distro_bootcmd; " \ - "mmc dev ${mmcdev}; if mmc rescan; then " \ - "if run userbutton; then " \ - "setenv bootenv uEnv.txt;" \ - "else " \ - "setenv bootenv user.txt;" \ - "fi;" \ - "echo SD/MMC found on device ${mmcdev};" \ - "if run loadbootenv; then " \ - "echo Loaded environment from ${bootenv};" \ - "run importbootenv;" \ - "fi;" \ - "if test -n $uenvcmd; then " \ - "echo Running uenvcmd ...;" \ - "run uenvcmd;" \ - "fi;" \ - "if run loadbootscript; then " \ - "run bootscript; " \ - "else " \ - "if run loadimage; then " \ - "run loadfdt;" \ - "run mmcboot;" \ - "fi;" \ - "fi; " \ - "fi;" \ - "run nandboot;" \ - "setenv bootfile zImage;" \ - "if run loadimage; then " \ - "run loadfdt;" \ - "run mmcbootz; " \ - "fi; " \ + func(MMC, mmc, 0) \ + func(LEGACY_MMC, legacy_mmc, 0) \ + func(UBIFS, ubifs, 0) \ + func(NAND, nand, 0) + +#else /* !CONFIG_NAND */ + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(LEGACY_MMC, legacy_mmc, 0) + +#endif /* CONFIG_NAND */ #include #define CONFIG_EXTRA_ENV_SETTINGS \ - DEFAULT_LINUX_BOOT_ENV \ + MEM_LAYOUT_ENV_SETTINGS \ + "fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \ "fdt_high=0xffffffff\0" \ - "usbtty=cdc_acm\0" \ - "bootfile=uImage\0" \ - "ramdisk=ramdisk.gz\0" \ + "console=ttyO2,115200n8\0" \ "bootdir=/boot\0" \ + "bootenv=uEnv.txt\0" \ + "bootfile=zImage\0" \ "bootpart=0:2\0" \ - "console=ttyO2,115200n8\0" \ + "bootubivol=rootfs\0" \ + "bootubipart=rootfs\0" \ + "usbtty=cdc_acm\0" \ "mpurate=auto\0" \ "buddy=none\0" \ - "optargs=\0" \ "camera=none\0" \ "vram=12M\0" \ "dvimode=640x480MR-16@60\0" \ "defaultdisplay=dvi\0" \ - "mmcdev=0\0" \ - "mmcroot=/dev/mmcblk0p2 rw\0" \ - "mmcrootfstype=ext4 rootwait\0" \ - "nandroot=ubi0:rootfs ubi.mtd=4\0" \ - "nandrootfstype=ubifs\0" \ - "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ - "ramrootfstype=ext2\0" \ - "mmcargs=setenv bootargs console=${console} " \ - "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "camera=${camera} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${mmcroot} " \ - "rootfstype=${mmcrootfstype}\0" \ - "nandargs=setenv bootargs console=${console} " \ - "${optargs} " \ + "defaultargs=setenv defargs " \ "mpurate=${mpurate} " \ "buddy=${buddy} "\ "camera=${camera} "\ "vram=${vram} " \ "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${nandroot} " \ - "rootfstype=${nandrootfstype}\0" \ + "omapdss.def_disp=${defaultdisplay}\0" \ + "optargs=\0" \ "findfdt=" \ "if test $beaglerev = AxBx; then " \ "setenv fdtfile omap3-beagle.dtb; fi; " \ @@ -167,49 +149,92 @@ "if test $beaglerev = xMC; then " \ "setenv fdtfile omap3-beagle-xm.dtb; fi; " \ "if test $fdtfile = undefined; then " \ - "echo WARNING: Could not determine device tree to use; fi; \0" \ + "echo WARNING: Could not determine device tree to use; fi\0" \ + "mmcdev=0\0" \ + "mmcpart=2\0" \ + "mmcroot=/dev/mmcblk0p2 rw\0" \ + "mmcrootfstype=ext4 rootwait\0" \ + "mmcargs=run defaultargs; setenv bootargs console=${console} " \ + "${mtdparts} " \ + "${defargs} " \ + "${optargs} " \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ + "userbutton_xm=gpio input 4;\0" \ + "userbutton_nonxm=gpio input 7;\0" \ + "userbutton=if gpio input 173; then " \ + "run userbutton_xm; " \ + "else " \ + "run userbutton_nonxm; " \ + "fi;\0" \ + "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ + "ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \ + "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ + "env import -t ${loadaddr} ${filesize}\0" \ + "mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \ + "mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "if run userbutton; then " \ + "setenv bootenv uEnv.txt;" \ + "else " \ + "setenv bootenv user.txt;" \ + "fi;" \ + "run loadbootenv && run importbootenv; " \ + "run ext4bootenv && run importbootenv; " \ + "if test -n $uenvcmd; then " \ + "echo Running uenvcmd ...; " \ + "run uenvcmd; " \ + "fi; " \ + "fi\0" \ "validatefdt=" \ "if test $beaglerev = xMAB; then " \ "if test ! -e mmc ${bootpart} ${bootdir}/${fdtfile}; then " \ "setenv fdtfile omap3-beagle-xm.dtb; " \ "fi; " \ "fi; \0" \ - "bootenv=uEnv.txt\0" \ - "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ - "env import -t -r $loadaddr $filesize\0" \ - "ramargs=setenv bootargs console=${console} " \ + "loadimage=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ + "loaddtb=run validatefdt; ext4load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ + "mmcboot=run mmcbootenv; " \ + "if run loadimage && run loaddtb; then " \ + "echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} ...; " \ + "run mmcargs; " \ + "if test ${bootfile} = uImage; then " \ + "bootm ${loadaddr} - ${fdtaddr}; " \ + "fi; " \ + "if test ${bootfile} = zImage; then " \ + "bootz ${loadaddr} - ${fdtaddr}; " \ + "fi; " \ + "fi\0" \ + "nandroot=ubi0:rootfs ubi.mtd=rootfs rw\0" \ + "nandrootfstype=ubifs rootwait\0" \ + "nandargs=run defaultargs; setenv bootargs console=${console} " \ + "${mtdparts} " \ + "${defargs} " \ "${optargs} " \ - "mpurate=${mpurate} " \ - "buddy=${buddy} "\ - "vram=${vram} " \ - "omapfb.mode=dvi:${dvimode} " \ - "omapdss.def_disp=${defaultdisplay} " \ - "root=${ramroot} " \ - "rootfstype=${ramrootfstype}\0" \ - "loadramdisk=load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ - "loadimage=load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \ - "loadbootscript=load mmc ${mmcdev} ${loadaddr} boot.scr\0" \ - "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ - "source ${loadaddr}\0" \ - "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ - "mmcboot=echo Booting ${bootfile} with DT from mmc${mmcdev} ...; " \ - "run mmcargs; " \ - "bootm ${loadaddr} - ${fdtaddr}\0" \ - "mmcbootz=echo Booting ${bootfile} with DT from mmc${mmcdev} ...; " \ - "run mmcargs; " \ - "bootz ${loadaddr} - ${fdtaddr}\0" \ - "nandboot=echo Booting from nand ...; " \ - "run nandargs; " \ - "nand read ${loadaddr} 280000 400000; " \ - "bootm ${loadaddr}\0" \ - "ramboot=echo Booting from ramdisk ...; " \ - "run ramargs; " \ - "bootm ${loadaddr}\0" \ - "userbutton=if gpio input 173; then run userbutton_xm; " \ - "else run userbutton_nonxm; fi;\0" \ - "userbutton_xm=gpio input 4;\0" \ - "userbutton_nonxm=gpio input 7;\0" \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandboot=if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \ + "echo Booting uImage from NAND MTD 'kernel' partition ...; " \ + "run nandargs; " \ + "bootm ${loadaddr} - ${fdtaddr}; " \ + "fi\0" \ + "loadramdisk=ext4load mmc ${bootpart} ${rdaddr} ${bootdir}/${ramdisk}\0" \ + "ramdisk=rootfs.ext2.gz.uboot\0" \ + "ramdisk_size=16384\0" \ + "ramroot=/dev/ram rw\0" \ + "ramrootfstype=ext2\0" \ + "ramargs=run defaultargs; setenv bootargs console=${console} " \ + "${mtdparts} " \ + "${defargs} " \ + "${optargs} " \ + "root=${ramroot} ramdisk_size=${ramdisk_size} " \ + "rootfstype=${ramrootfstype}\0" \ + "ramboot=run mmcbootenv; " \ + "if run loadimage && run loaddtb && run loadramdisk; then " \ + "echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} w/ramdisk ...; " \ + "run ramargs; " \ + "bootz ${loadaddr} ${rdaddr} ${fdtaddr}; " \ + "fi\0" \ BOOTENV #endif /* __CONFIG_H */ From patchwork Sat Feb 24 14:09:42 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Derald D. Woods" X-Patchwork-Id: 877417 X-Patchwork-Delegate: trini@ti.com Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=none (mailfrom) smtp.mailfrom=lists.denx.de (client-ip=81.169.180.215; helo=lists.denx.de; envelope-from=u-boot-bounces@lists.denx.de; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=gmail.com Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b="YpEcyFrH"; dkim-atps=neutral Received: from lists.denx.de (dione.denx.de [81.169.180.215]) by ozlabs.org (Postfix) with ESMTP id 3zpVQb6Prrz9sWH for ; Sun, 25 Feb 2018 01:12:07 +1100 (AEDT) Received: by lists.denx.de (Postfix, from userid 105) id 9108CC21D56; Sat, 24 Feb 2018 14:10:41 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on lists.denx.de X-Spam-Level: X-Spam-Status: No, score=-0.0 required=5.0 tests=FREEMAIL_FROM, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, T_DKIM_INVALID autolearn=unavailable autolearn_force=no version=3.4.0 Received: from lists.denx.de (localhost [IPv6:::1]) by lists.denx.de (Postfix) with ESMTP id 0EED6C21FDE; Sat, 24 Feb 2018 14:10:38 +0000 (UTC) Received: by lists.denx.de (Postfix, from userid 105) id A86B5C22007; Sat, 24 Feb 2018 14:10:09 +0000 (UTC) Received: from mail-it0-f66.google.com (mail-it0-f66.google.com [209.85.214.66]) by lists.denx.de (Postfix) with ESMTPS id F3CCCC22014 for ; Sat, 24 Feb 2018 14:10:05 +0000 (UTC) Received: by mail-it0-f66.google.com with SMTP id a203so7569298itd.1 for ; Sat, 24 Feb 2018 06:10:05 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=rfqjEJebIr50dNLrykn/EEDl8Iy+pC6nS+15iLXGseo=; b=YpEcyFrHT75pohNJBLsVJkStq19fsMjiSEh+z8OwdugkO9H19MKtkwcnwAt66yHn3x TiBivtY5panpMmS7mLr2RIv0HplpKwbCkKrX7msFU0qtFxWjvmtciQEDLvHkrQy0b+2D 3aDaJCbp2BZK0MRDIP8SfbfIEABfXoOwVPqedZ+qzuIfc2fEZOPFDGyO5bmrPviPI9pU wd25ciIeZ9OLGznUhhOBYp92JgK1NYxwwnccj20cTrE2A+6K+hX1sZgupfdx+yHLlUOb aKE8YeWWg3Fx3AFE1QUWCA9nkFl9ymxJjgWKx5bGvSzAr22GBR1WHdzZY55UfjSqRo+z m3Zg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=rfqjEJebIr50dNLrykn/EEDl8Iy+pC6nS+15iLXGseo=; b=MQEGJXOvm6Ullw1FvMwMfjglUenXPmFPlh33a1gDh5byq3j9CsZ2MIT8r/SdGulbzF 8ge70KdCKswz/NAOF9/U33N7PZxmmnp2VrKEllcUDZVdDV+9ugF9extD+wSblBap/RUo IVT9khNQvRA62QrhLkTvE1wtn8wyzBwycMByjcsDh6GVwp/OPZA+dmi2Uo+MQv2YhQOh 46mehGhosh0naUx7KhpE89/pABsH5K/zT6RlBlvttbZBAG50G/4kQJC6lwlL1FWe9JBB WscM1cSFanW7k/3frSnLYfQwtbsr3phychAB1cRhurH8vpDimaO7026P1IzVaTQu8X52 8LAA== X-Gm-Message-State: APf1xPDXH/bzm6NSwDfvw5r/xhgNlyYkwBp2h/dtv1iybDiA64dzgp0d X93LqcpX18gtLA0/9wLdeFasjQ== X-Google-Smtp-Source: AH8x227MceZb/KiFg/WbC3OZzVKL3POxcCrfFKFqyYfcl0UHj4XkHZx8rmf4sd1xK5oUPDZ1szbZyg== X-Received: by 10.36.50.85 with SMTP id j82mr6599278ita.82.1519481404456; Sat, 24 Feb 2018 06:10:04 -0800 (PST) Received: from ethiopia.woodsts.org (c-73-74-196-48.hsd1.il.comcast.net. [73.74.196.48]) by smtp.gmail.com with ESMTPSA id z133sm2831355itb.2.2018.02.24.06.10.03 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Sat, 24 Feb 2018 06:10:03 -0800 (PST) From: "Derald D. Woods" To: u-boot@lists.denx.de Date: Sat, 24 Feb 2018 08:09:42 -0600 Message-Id: <20180224140942.25332-4-woods.technical@gmail.com> X-Mailer: git-send-email 2.16.2 In-Reply-To: <20180224140942.25332-1-woods.technical@gmail.com> References: <20180212051329.29761-1-woods.technical@gmail.com> <20180224140942.25332-1-woods.technical@gmail.com> Cc: trini@konsulko.com Subject: [U-Boot] [PATCH v2 3/3] ARM: omap3: evm: Sync with omap3_beagle configuration X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.18 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" This commit does the following for OMAP3 EVM: - Track omap3_beagle changes where possible - Remove CONFIG_SYS_MPUCLK and CONFIG_MTD which are not needed for the default board configuration to work. - Remove CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_MALLOC_F_LEN from default config. CONFIG_SYS_MALLOC_F_LEN=0x400 is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y] - Use CONFIG_ENV_IS_IN_FAT because of development flexibility - Use updated NAND layout: device nand0 , # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 ------------------------------------------------- Signed-off-by: Derald D. Woods --- configs/omap3_evm_defconfig | 25 +++++++++------- include/configs/omap3_evm.h | 71 ++++++++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 41 deletions(-) diff --git a/configs/omap3_evm_defconfig b/configs/omap3_evm_defconfig index 34998777a0..6ed470fe1e 100644 --- a/configs/omap3_evm_defconfig +++ b/configs/omap3_evm_defconfig @@ -1,22 +1,22 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_ENV_SUPPORT=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP3_EVM # " -# CONFIG_CMD_IMI is not set +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y @@ -30,23 +30,27 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_UUID=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1792k(u-boot),128k(dtb),128k(u-boot-env),6m(kernel),-(rootfs)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SPL_DM=y CONFIG_MMC_OMAP_HS=y -CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y @@ -54,14 +58,13 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 1392593b9d..36bf51a1c0 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -54,51 +54,58 @@ #define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCBYTES 3 #define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 -#define CONFIG_ENV_IS_IN_NAND 1 -#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */ +#define CONFIG_SYS_ENV_SECT_SIZE SZ_128K #define CONFIG_ENV_OFFSET 0x260000 #define CONFIG_ENV_ADDR 0x260000 #define CONFIG_ENV_OVERWRITE #define CONFIG_MTD_PARTITIONS /* required for UBI partition support */ /* NAND: SPL falcon mode configs */ #if defined(CONFIG_SPL_OS_BOOT) -#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000 +#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000 #endif /* CONFIG_SPL_OS_BOOT */ #endif /* CONFIG_NAND */ -/* MUSB */ - -/* USB EHCI */ -#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 - /* Environment */ +#define CONFIG_ENV_SIZE SZ_128K + #define CONFIG_PREBOOT "usb start" #define MEM_LAYOUT_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV -#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ - "bootcmd_" #devtypel #instance "=" \ - "run nandboot\0" -#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ - #devtypel #instance " " - #define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \ "bootcmd_" #devtypel #instance "=" \ "setenv mmcdev " #instance "; " \ - "setenv bootpart " #instance ":${mmcpart} ; " \ "run mmcboot\0" #define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \ #devtypel #instance " " +#if defined(CONFIG_NAND) + +#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \ + "bootcmd_" #devtypel #instance "=" \ + "if test ${mtdids} = '' || test ${mtdparts} = '' ; then " \ + "echo NAND boot disabled: No mtdids and/or mtdparts; " \ + "else " \ + "run nandboot; " \ + "fi\0" +#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \ + #devtypel #instance " " + #define BOOT_TARGET_DEVICES(func) \ func(MMC, mmc, 0) \ func(LEGACY_MMC, legacy_mmc, 0) \ func(UBIFS, ubifs, 0) \ func(NAND, nand, 0) +#else /* !CONFIG_NAND */ + +#define BOOT_TARGET_DEVICES(func) \ + func(MMC, mmc, 0) \ + func(LEGACY_MMC, legacy_mmc, 0) + +#endif /* CONFIG_NAND */ + #include #define CONFIG_EXTRA_ENV_SETTINGS \ @@ -107,31 +114,29 @@ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ "fdt_high=0xffffffff\0" \ + "console=ttyO0,115200n8\0" \ "bootdir=/boot\0" \ "bootenv=uEnv.txt\0" \ "bootfile=zImage\0" \ + "bootpart=0:2\0" \ "bootubivol=rootfs\0" \ "bootubipart=rootfs\0" \ "optargs=\0" \ "mmcdev=0\0" \ "mmcpart=2\0" \ - "bootpart=${mmcdev}:${mmcpart}\0" \ - "console=ttyO0,115200n8\0" \ + "mmcroot=/dev/mmcblk0p2 rw\0" \ + "mmcrootfstype=ext4 rootwait\0" \ "mmcargs=setenv bootargs console=${console} " \ "${mtdparts} " \ "${optargs} " \ - "root=/dev/mmcblk0p2 rw " \ - "rootfstype=ext4 rootwait\0" \ - "nandargs=setenv bootargs console=${console} " \ - "${mtdparts} " \ - "${optargs} " \ - "root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd " \ - "rootfstype=ubifs rootwait\0" \ + "root=${mmcroot} " \ + "rootfstype=${mmcrootfstype}\0" \ "loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \ "ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \ - "importbootenv=echo Importing environment from mmc ...; " \ + "importbootenv=echo Importing environment from mmc${mmcdev} ...; " \ "env import -t ${loadaddr} ${filesize}\0" \ - "mmcbootenv=mmc dev ${mmcdev}; " \ + "mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \ + "mmc dev ${mmcdev}; " \ "if mmc rescan; then " \ "run loadbootenv && run importbootenv; " \ "run ext4bootenv && run importbootenv; " \ @@ -153,8 +158,14 @@ "bootz ${loadaddr} - ${fdtaddr}; " \ "fi; " \ "fi\0" \ - "nandboot=" \ - "if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \ + "nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd\0" \ + "nandrootfstype=ubifs rootwait\0" \ + "nandargs=setenv bootargs console=${console} " \ + "${mtdparts} " \ + "${optargs} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandboot=if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \ "echo Booting uImage from NAND MTD 'kernel' partition ...; " \ "run nandargs; " \ "bootm ${loadaddr} - ${fdtaddr}; " \