Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id CB638C38142 for ; Fri, 27 Jan 2023 05:50:59 +0000 (UTC) Received: from h2850616.stratoserver.net (localhost [IPv6:::1]) by phobos.denx.de (Postfix) with ESMTP id 6DDA585645; Fri, 27 Jan 2023 06:50:57 +0100 (CET) Authentication-Results: phobos.denx.de; dmarc=none (p=none dis=none) header.from=denx.de Authentication-Results: phobos.denx.de; spf=pass smtp.mailfrom=u-boot-bounces@lists.denx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1674798658; bh=AUB90hsKid4m6Mg5uivM0Wej/XbJeAoN8Ue7LilYl6Q=; h=From:To:Cc:Subject:Date:List-Id:List-Unsubscribe:List-Archive: List-Post:List-Help:List-Subscribe:From; b=SrjNs/KfACYjnBKZ1QZOsjWrDWDLtJQzPDmXByD0vRKH/a8KBi/b3U2SrexpwtlT+ L+lWeEUd5itbrqn8Fp39Eo1b7cCZaoI/Q/lWGhXQy+v4Skkc/Tc5EZ9sHBYCG2tc7W znpdQrVq+GCEID41H2ckRzsjZGWf/MlsDBwPW3S+UE+E+5tI7F2VDZg33HYpJYYJjZ tsQQtMLbbTKn8zo7bl7w+BYAef0FvuZa7QBy+Ytw/hjHjqa3pledsWvaPVLr9b4w5R EJOzzZq4eKGChRBk08HsZkOKiaMs+1ApUNaEbc1BzBGc3EiqCyQu08twusO3L3U9+m UmfVOt/Kbxiqw== Received: from mail-internal.denx.de (p578adb1c.dip0.t-ipconnect.de [87.138.219.28]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: noc@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id 742B38554E; Fri, 27 Jan 2023 06:50:55 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1674798655; bh=AUB90hsKid4m6Mg5uivM0Wej/XbJeAoN8Ue7LilYl6Q=; h=From:To:Cc:Subject:Date:From; b=i1gcunfasAOW+LnsB1LhucbmxKUXIHK9eKfs9SkmMVSdvdreM3dJw9lPeTqoqPIHu 6oW/iUepA5faQ2rgecj4gzZvXGzaTJgRwmALVNlX6UxyohzzgDDMuwDYnzNmHEyCse Y5ZAYYI6riPXP4pvek6oRoPrA6ZZ0vkvvmcCFZujvFZKaW+pANDM+JX8cSouKj6+w4 Tfh0wNhJz5SNGy5AMUyk7DSkyo/igRAFXVy93ktnVxsAoRzYVMMdwFmgbpTJuvhi2I mDRMNA5PAail46We7DsEii3xqJnPtY5VqA0/0DEVRNA+jAxSCzpfCa0JA7ycEjZ6ea qWQ8YNwLf+j9g== Received: from pollux.denx.de (pollux [192.168.1.1]) by mail-internal.denx.de (Postfix) with ESMTPS id EF630180336; Fri, 27 Jan 2023 06:50:53 +0100 (CET) Received: by pollux.denx.de (Postfix, from userid 515) id BFCA71A8BF9; Fri, 27 Jan 2023 06:50:53 +0100 (CET) From: Heiko Schocher To: U-Boot Mailing List Cc: pali@kernel.org, Tom Rini , Heiko Schocher Subject: [PATCH v2] powerpc/mpc85xx: use board env file for socrates board Date: Fri, 27 Jan 2023 06:50:52 +0100 Message-Id: <20230127055052.356374-1-hs@denx.de> X-Mailer: git-send-email 2.37.3 MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-BeenThere: u-boot@lists.denx.de X-Mailman-Version: 2.1.39 Precedence: list List-Id: U-Boot discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: u-boot-bounces@lists.denx.de Sender: "U-Boot" X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean as Tom suggested get rid of CFG_EXTRA_ENV_SETTINGS and enable CONFIG_ENV_SOURCE_FILE and use text file board/socrates/socrates.env which contains the default environment. While at it, cleanup the default Environment. Signed-off-by: Heiko Schocher Suggested-by: Tom Rini --- This patch is a follow up as requested from Tom to socrates series posted here: https://lists.denx.de/pipermail/u-boot/2023-January/506030.html Changes in v2: add changes requested from Tom: remove baudrate, bootcmd, bootdelay, mtdids and mtdpart setting in env file remove CONFIG_ENV_SOURCE_FILE board/socrates/socrates.env | 46 +++++++++++++++++++++++++++ configs/socrates_defconfig | 2 +- include/configs/socrates.h | 62 ------------------------------------- 3 files changed, 47 insertions(+), 63 deletions(-) create mode 100644 board/socrates/socrates.env diff --git a/board/socrates/socrates.env b/board/socrates/socrates.env new file mode 100644 index 0000000000..82e7ff8386 --- /dev/null +++ b/board/socrates/socrates.env @@ -0,0 +1,46 @@ +addcons=setenv bootargs $bootargs console=$consdev,$baudrate +addip=setenv bootargs $bootargs ip=$ipaddr:$serverip:$gatewayip:$netmask:$hostname:$netdev:off panic=1 +addmtd=setenv bootargs ${bootargs} ${mtdparts} +boot_nor=run ramargs addcons addmtd; + if test -n ${RescueSystemJumper} ;then + run rescueargs; + else + if imi ${system1_addr};then + bootm ${system1_addr}; + else + setenv RescueSystemJumper 1;run rescueargs; + fi; + fi; + if imi ${system2_addr}; then + bootm ${system2_addr}; + fi; +boot_usb=usb start; + ext2load usb 0 ${usb_boot_script_r} ${usb_boot_script}; + if imi ${usb_boot_script_r};then + source ${usb_boot_script_r}#conf; + fi; +clean_data=era FFA00000 FFFEFFFF +clean_uboot_env=protect off FFF00000 FFF3FFFF;era FFF00000 FFF3FFFF +consdev=ttyS0 +ethprime=eTSEC0 +initrd_high=0x03000000 +loadaddr=0x02000000 +loads_echo=1 +netdev=eth0 +nfsargs=setenv bootargs root=/dev/nfs rw nfsroot=$serverip:$rootpath +preboot=echo;echo Welcome on the Socrates Board;echo +ramargs=setenv bootargs root=/dev/ram rw +rescueargs=setenv bootargs $bootargs RescueSystemJumper=$RescueSystemJumper +rootpath=/opt/poky/3.1.17 +system1_addr=FE000000 +system1_file=system1.itb +system2_addr=FED00000 +system2_file=system2.itb +uboot_addr=FFF40000 +uboot_file=u-boot.bin +update_system1=tftp 110000 ${system1_file};era ${system1_addr} FECFFFFF;cp.b 110000 ${system1_addr} ${filesize};setenv filesize +update_system2=tftp 110000 ${system2_file};era ${system2_addr} FF9FFFFF;cp.b 110000 ${system2_addr} ${filesize};setenv filesize +update_uboot=tftp 110000 ${uboot_file};protect off ${uboot_addr} FFFFFFFF;era ${uboot_addr} FFFFFFFF;cp.b 110000 ${uboot_addr} ${filesize};setenv filesize +usb_boot_script=/boot/socrates_boot.autoscr +usb_boot_script_r=100000 +verify=1 diff --git a/configs/socrates_defconfig b/configs/socrates_defconfig index e03c971b5e..312fda9ad0 100644 --- a/configs/socrates_defconfig +++ b/configs/socrates_defconfig @@ -31,7 +31,7 @@ CONFIG_BOOT_RETRY=y CONFIG_BOOT_RETRY_TIME=120 CONFIG_RESET_TO_RETRY=y CONFIG_USE_BOOTCOMMAND=y -CONFIG_BOOTCOMMAND="run boot_nor" +CONFIG_BOOTCOMMAND="run boot_usb;run boot_nor" CONFIG_USE_PREBOOT=y CONFIG_PREBOOT="echo;echo Welcome on the ABB Socrates Board;echo" CONFIG_SYS_CONSOLE_IS_IN_ENV=y diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 305914de85..64cc17ca7c 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -109,68 +109,6 @@ */ #define CFG_SYS_BOOTMAPSZ (8 << 20) /* Initial Memory map for Linux */ -#define SOCRATES_ENV_MTD \ - "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \ - "mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \ - "addmtd=setenv bootargs ${bootargs} ${mtdparts}\0" - -#define CFG_EXTRA_ENV_SETTINGS \ - "netdev=eth0\0" \ - "consdev=ttyS0\0" \ - "initrd_high=0x03000000\0" \ - "uboot_file=/home/tftp/syscon3/u-boot.bin\0" \ - "bootfile=/home/tftp/syscon3/uImage\0" \ - "fdt_file=/home/tftp/syscon3/socrates.dtb\0" \ - "initrd_file=/home/tftp/syscon3/uinitrd.gz\0" \ - "uboot_addr=FFF40000\0" \ - "kernel_addr=FE000000\0" \ - "fdt_addr=FE1E0000\0" \ - "ramdisk_addr=FE200000\0" \ - "fdt_addr_r=B00000\0" \ - "kernel_addr_r=200000\0" \ - "ramdisk_addr_r=400000\0" \ - "rootpath=/opt/eldk/ppc_85xxDP\0" \ - "ramargs=setenv bootargs root=/dev/ram rw\0" \ - "nfsargs=setenv bootargs root=/dev/nfs rw " \ - "nfsroot=$serverip:$rootpath\0" \ - "addcons=setenv bootargs $bootargs " \ - "console=$consdev,$baudrate\0" \ - "addip=setenv bootargs $bootargs " \ - "ip=$ipaddr:$serverip:$gatewayip:$netmask" \ - ":$hostname:$netdev:off panic=1\0" \ - "boot_nor=run ramargs addcons addmtd;" \ - "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ - "net_nfs=tftp ${kernel_addr_r} ${bootfile}; " \ - "tftp ${fdt_addr_r} ${fdt_file}; " \ - "run nfsargs addip addcons addmtd;" \ - "bootm ${kernel_addr_r} - ${fdt_addr_r}\0" \ - "update_uboot=tftp 100000 ${uboot_file};" \ - "protect off ${uboot_addr} ffffffff;" \ - "era ${uboot_addr} ffffffff;" \ - "cp.b 100000 ${uboot_addr} ${filesize};" \ - "setenv filesize;saveenv\0" \ - "update_kernel=tftp 100000 ${bootfile};" \ - "era fe000000 fe1dffff;" \ - "cp.b 100000 fe000000 ${filesize};" \ - "setenv filesize;saveenv\0" \ - "update_fdt=tftp 100000 ${fdt_file};" \ - "era fe1e0000 fe1fffff;" \ - "cp.b 100000 fe1e0000 ${filesize};" \ - "setenv filesize;saveenv\0" \ - "update_initrd=tftp 100000 ${initrd_file};" \ - "era fe200000 fe9fffff;" \ - "cp.b 100000 fe200000 ${filesize};" \ - "setenv filesize;saveenv\0" \ - "clean_data=era fea00000 fff5ffff\0" \ - "usbargs=setenv bootargs root=/dev/sda1 rw\0" \ - "load_usb=usb start;" \ - "ext2load usb 0:1 ${kernel_addr_r} /boot/uImage\0" \ - "boot_usb=run load_usb usbargs addcons;" \ - "bootm ${kernel_addr_r} - ${fdt_addr};" \ - "bootm ${kernel_addr} ${ramdisk_addr} ${fdt_addr}\0" \ - SOCRATES_ENV_MTD \ - "" - #define CFG_ENV_FLAGS_LIST_STATIC "ethaddr:mw,eth1addr:mw,system1_addr:xw,serial#:sw,ethact:sw,ethprime:sw" /* pass open firmware flat tree */ -- 2.37.3