[U-Boot] [PATCH v2 0/8] ARM: Add Seagate GoFlexHome support
Thank you Wolfgang and Prafulla for feedback on patch v1. This is version 2.
I couldn't figure out how to squash all these changes in one file with git. Do I just cat them? Hence, for this patch request they are unsquashed and in separate emails. Please let me know how I should squash for v3!
This adds support for the Seagate GoFlexHome. It is based on the dockstar files for the most part.
Suriyan Ramasami (8): Add maintainer for the Seagate GoFlexHome Add a board entry for the Seagate GoFlexHome Present the user with a menu of bootable options on boot
MAINTAINERS | 4 + board/Seagate/goflexhome/Makefile | 51 ++++ board/Seagate/goflexhome/goflexhome.c | 187 +++++++++++++ board/Seagate/goflexhome/goflexhome.h | 47 ++++ board/Seagate/goflexhome/goflexhomemenu.c | 415 +++++++++++++++++++++++++++++ board/Seagate/goflexhome/kwbimage.cfg | 168 ++++++++++++ boards.cfg | 1 + include/configs/goflexhome.h | 141 ++++++++++ 8 files changed, 1014 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/Makefile create mode 100644 board/Seagate/goflexhome/goflexhome.c create mode 100644 board/Seagate/goflexhome/goflexhome.h create mode 100644 board/Seagate/goflexhome/goflexhomemenu.c create mode 100644 board/Seagate/goflexhome/kwbimage.cfg create mode 100644 include/configs/goflexhome.h
Create an entry for the Seagate GoFlexHome as goflexhome
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes for v2: - Coding style changes
MAINTAINERS | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS index 1614b91..6292a58 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -847,6 +847,10 @@ Sricharan R r.sricharan@ti.com omap4_sdp4430 ARM ARMV7 (OMAP4xx SoC) omap5_evm ARM ARMV7 (OMAP5xx Soc)
+Suriyan Ramasami suriyan.r@gmail.com + + goflexhome ARM926EJS (Kirkwood SoC) + Thierry Reding thierry.reding@avionic-design.de
plutux Tegra20 (ARM7 & A9 Dual Core)
Create an entry for the Seagate GoFlexHome as goflexhome Its exactly like the dockstar entry.
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes for v2: - Coding style changes
boards.cfg | 1 + 1 files changed, 1 insertions(+), 0 deletions(-)
diff --git a/boards.cfg b/boards.cfg index 5fc70be..d6f8593 100644 --- a/boards.cfg +++ b/boards.cfg @@ -184,6 +184,7 @@ rd6281a arm arm926ejs - Marvell sheevaplug arm arm926ejs - Marvell kirkwood ib62x0 arm arm926ejs ib62x0 raidsonic kirkwood dockstar arm arm926ejs - Seagate kirkwood +goflexhome arm arm926ejs - Seagate kirkwood tk71 arm arm926ejs tk71 karo kirkwood devkit3250 arm arm926ejs devkit3250 timll lpc32xx jadecpu arm arm926ejs jadecpu syteco mb86r0x
Start with dockstar's dockstar.h Add #define CONFIG_CMD_IDE, CONFIG_MVSATA_IDE for IDE support Add #define CONFIG_CMD_DATE, CONFIG_RTC_MV for RTC support Add #define CONFIG_CMD_EXT4 for supporting ext4 FS Change CONFIG_SYS_PROMPT to be GoFlex specific Change CONFIG_ENV_ADDR and CONFIG_ENV_OFFSET to default address present in ArchLinuxArm install (/etc/fw_env.config) Add #define CONFIG_MENU to enable u-boot MENU Add #define CONFIG_MENU_SHOW to show the menu on boot
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes for v2: - Coding style changes
include/configs/goflexhome.h | 141 ++++++++++++++++++++++++++++++++++++++++++ 1 files changed, 141 insertions(+), 0 deletions(-) create mode 100644 include/configs/goflexhome.h
diff --git a/include/configs/goflexhome.h b/include/configs/goflexhome.h new file mode 100644 index 0000000..03a7b22 --- /dev/null +++ b/include/configs/goflexhome.h @@ -0,0 +1,141 @@ +/* + * Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com + * + * Based on dockstar.h originally written by + * Copyright (C) 2010 Eric C. Cooper ecc@cmu.edu + * + * Based on sheevaplug.h originally written by + * Prafulla Wadaskar prafulla@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef _CONFIG_GOFLEXHOME_H +#define _CONFIG_GOFLEXHOME_H + +/* + * Version number information + */ +#define CONFIG_IDENT_STRING "\nSeagate GoFlex Home" + +/* + * High Level Configuration Options (easy to change) + */ +#define CONFIG_FEROCEON_88FR131 1 /* CPU Core subversion */ +#define CONFIG_KIRKWOOD 1 /* SOC Family Name */ +#define CONFIG_KW88F6281 1 /* SOC Name */ +#define CONFIG_MACH_GOFLEXHOME /* Machine type */ +#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ + +/* + * Commands configuration + */ +#define CONFIG_SYS_NO_FLASH /* Declare no flash (NOR/SPI) */ +#define CONFIG_CONSOLE_MUX +#define CONFIG_SYS_CONSOLE_IS_IN_ENV + +#include <config_cmd_default.h> +#define CONFIG_CMD_DHCP +#define CONFIG_CMD_ENV +#define CONFIG_CMD_MII +#define CONFIG_CMD_NAND +#define CONFIG_CMD_PING +#define CONFIG_CMD_USB +#define CONFIG_CMD_IDE +#define CONFIG_CMD_DATE +#define CONFIG_CMD_EXT4 +#define CONFIG_SYS_MVFS /* Picks up Filesystem from mv-common.h */ + +/* + * mv-common.h should be defined after CMD configs since it used them + * to enable certain macros + */ +#include "mv-common.h" + +#undef CONFIG_SYS_PROMPT /* previously defined in mv-common.h */ +#define CONFIG_SYS_PROMPT "GoFlexHome> " /* Command Prompt */ + +/* + * Environment variables configurations + */ +#ifdef CONFIG_CMD_NAND +#define CONFIG_ENV_IS_IN_NAND 1 +#define CONFIG_ENV_SECT_SIZE 0x20000 /* 128K */ +#else +#define CONFIG_ENV_IS_NOWHERE 1 /* if env in SDRAM */ +#endif +/* + * max 4k env size is enough, but in case of nand + * it has to be rounded to sector size + */ +#define CONFIG_ENV_SIZE 0x20000 /* 128k */ +#define CONFIG_ENV_ADDR 0xC0000 +#define CONFIG_ENV_OFFSET 0xC0000 /* env starts here */ + +/* + * Default environment variables + */ +#define CONFIG_BOOTCOMMAND \ + "setenv bootargs ${console} ${mtdparts} ${bootargs_root}; " \ + "ubi part root; " \ + "ubifsmount ubi:root; " \ + "ubifsload 0x800000 ${kernel}; " \ + "bootm 0x800000" + +#define CONFIG_MTDPARTS \ + "mtdparts=orion_nand:1m(uboot),6M(uImage),-(root)\0" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "console=console=ttyS0,115200\0" \ + "mtdids=nand0=orion_nand\0" \ + "mtdparts="CONFIG_MTDPARTS \ + "kernel=/boot/uImage\0" \ + "bootargs_root=ubi.mtd=root root=ubi0:root rootfstype=ubifs ro\0" + +/* + * Ethernet Driver configuration + */ +#ifdef CONFIG_CMD_NET +#define CONFIG_MVGBE_PORTS {1, 0} /* enable port 0 only */ +#define CONFIG_PHY_BASE_ADR 0 +#endif /* CONFIG_CMD_NET */ + +/* + * * SATA Driver configuration + * */ +#ifdef CONFIG_MVSATA_IDE +#define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET +#endif /*CONFIG_MVSATA_IDE*/ + +/* + * * RTC driver configuration + * */ +#ifdef CONFIG_CMD_DATE +#define CONFIG_RTC_MV +#endif /* CONFIG_CMD_DATE */ + +/* Enable u-boot MENU */ +#define CONFIG_MENU + +/* Show the menu on boot */ +#define CONFIG_MENU_SHOW + +#endif /* _CONFIG_GOFLEXHOME_H */
Start with the Dockstar Makefile Add the two object files goflexhome.o and goflexhomemenu.o that need to be compiled
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes for v2: - Coding style changes
board/Seagate/goflexhome/Makefile | 51 +++++++++++++++++++++++++++++++++++++ 1 files changed, 51 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/Makefile
diff --git a/board/Seagate/goflexhome/Makefile b/board/Seagate/goflexhome/Makefile new file mode 100644 index 0000000..dc06137 --- /dev/null +++ b/board/Seagate/goflexhome/Makefile @@ -0,0 +1,51 @@ +# +# Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com +# +# Based on dockstar/Makefile originally written by +# Copyright (C) 2010 Eric C. Cooper ecc@cmu.edu +# +# Based on sheevaplug/Makefile originally written by +# Prafulla Wadaskar prafulla@marvell.com +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# + +include $(TOPDIR)/config.mk + +LIB = $(obj)lib$(BOARD).o + +COBJS := goflexhome.o goflexhomemenu.o + +SRCS := $(SOBJS:.o=.S) $(COBJS:.o=.c) +OBJS := $(addprefix $(obj),$(COBJS)) +SOBJS := $(addprefix $(obj),$(SOBJS)) + +$(LIB): $(obj).depend $(OBJS) $(SOBJS) + $(call cmd_link_o_target, $(OBJS) $(SOBJS)) + +######################################################################### + +# defines $(obj).depend target +include $(SRCTREE)/rules.mk + +sinclude $(obj).depend + +#########################################################################
Start with the Dockstar kwbimage.cfg Absolutely no change from the dockstar file
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes for v2: - Coding style changes
board/Seagate/goflexhome/kwbimage.cfg | 168 +++++++++++++++++++++++++++++++++ 1 files changed, 168 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/kwbimage.cfg
diff --git a/board/Seagate/goflexhome/kwbimage.cfg b/board/Seagate/goflexhome/kwbimage.cfg new file mode 100644 index 0000000..e984d72 --- /dev/null +++ b/board/Seagate/goflexhome/kwbimage.cfg @@ -0,0 +1,168 @@ +# +# Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com +# +# Based on dockstar/kwbimage.cfg originally written by +# Copyright (C) 2010 Eric C. Cooper ecc@cmu.edu +# +# Based on sheevaplug/kwbimage.cfg originally written by +# Prafulla Wadaskar prafulla@marvell.com +# (C) Copyright 2009 +# Marvell Semiconductor <www.marvell.com> +# +# See file CREDITS for list of people who contributed to this +# project. +# +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License as +# published by the Free Software Foundation; either version 2 of +# the License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, +# MA 02110-1301 USA +# +# Refer docs/README.kwimage for more details about how-to configure +# and create kirkwood boot image +# + +# Boot Media configurations +BOOT_FROM nand +NAND_ECC_MODE default +NAND_PAGE_SIZE 0x0800 + +# SOC registers configuration using bootrom header extension +# Maximum KWBIMAGE_MAX_CONFIG configurations allowed + +# Configure RGMII-0 interface pad voltage to 1.8V +DATA 0xFFD100e0 0x1b1b1b9b + +#Dram initalization for SINGLE x16 CL=5 @ 400MHz +DATA 0xFFD01400 0x43000c30 # DDR Configuration register +# bit13-0: 0xc30 (3120 DDR2 clks refresh rate) +# bit23-14: zero +# bit24: 1= enable exit self refresh mode on DDR access +# bit25: 1 required +# bit29-26: zero +# bit31-30: 01 + +DATA 0xFFD01404 0x37543000 # DDR Controller Control Low +# bit 4: 0=addr/cmd in smame cycle +# bit 5: 0=clk is driven during self refresh, we don't care for APX +# bit 6: 0=use recommended falling edge of clk for addr/cmd +# bit14: 0=input buffer always powered up +# bit18: 1=cpu lock transaction enabled +# bit23-20: 5=recommended value for CL=5 and STARTBURST_DEL disabled bit31=0 +# bit27-24: 7= CL+2, STARTBURST sample stages, for freqs 400MHz, unbuffered DIMM +# bit30-28: 3 required +# bit31: 0=no additional STARTBURST delay + +DATA 0xFFD01408 0x22125451 # DDR Timing (Low) (active cycles value +1) +# bit3-0: TRAS lsbs +# bit7-4: TRCD +# bit11- 8: TRP +# bit15-12: TWR +# bit19-16: TWTR +# bit20: TRAS msb +# bit23-21: 0x0 +# bit27-24: TRRD +# bit31-28: TRTP + +DATA 0xFFD0140C 0x00000a33 # DDR Timing (High) +# bit6-0: TRFC +# bit8-7: TR2R +# bit10-9: TR2W +# bit12-11: TW2W +# bit31-13: zero required + +DATA 0xFFD01410 0x0000000d # DDR Address Control +# bit1-0: 00, Cs0width=x8 +# bit3-2: 11, Cs0size=1Gb +# bit5-4: 00, Cs1width=nonexistent +# bit7-6: 00, Cs1size =nonexistent +# bit9-8: 00, Cs2width=nonexistent +# bit11-10: 00, Cs2size =nonexistent +# bit13-12: 00, Cs3width=nonexistent +# bit15-14: 00, Cs3size =nonexistent +# bit16: 0, Cs0AddrSel +# bit17: 0, Cs1AddrSel +# bit18: 0, Cs2AddrSel +# bit19: 0, Cs3AddrSel +# bit31-20: 0 required + +DATA 0xFFD01414 0x00000000 # DDR Open Pages Control +# bit0: 0, OpenPage enabled +# bit31-1: 0 required + +DATA 0xFFD01418 0x00000000 # DDR Operation +# bit3-0: 0x0, DDR cmd +# bit31-4: 0 required + +DATA 0xFFD0141C 0x00000C52 # DDR Mode +# bit2-0: 2, BurstLen=2 required +# bit3: 0, BurstType=0 required +# bit6-4: 4, CL=5 +# bit7: 0, TestMode=0 normal +# bit8: 0, DLL reset=0 normal +# bit11-9: 6, auto-precharge write recovery ???????????? +# bit12: 0, PD must be zero +# bit31-13: 0 required + +DATA 0xFFD01420 0x00000040 # DDR Extended Mode +# bit0: 0, DDR DLL enabled +# bit1: 0, DDR drive strenght normal +# bit2: 0, DDR ODT control lsd (disabled) +# bit5-3: 000, required +# bit6: 1, DDR ODT control msb, (disabled) +# bit9-7: 000, required +# bit10: 0, differential DQS enabled +# bit11: 0, required +# bit12: 0, DDR output buffer enabled +# bit31-13: 0 required + +DATA 0xFFD01424 0x0000F17F # DDR Controller Control High +# bit2-0: 111, required +# bit3 : 1 , MBUS Burst Chop disabled +# bit6-4: 111, required +# bit7 : 0 +# bit8 : 1 , add writepath sample stage, must be 1 for DDR freq >= 300MHz +# bit9 : 0 , no half clock cycle addition to dataout +# bit10 : 0 , 1/4 clock cycle skew enabled for addr/ctl signals +# bit11 : 0 , 1/4 clock cycle skew disabled for write mesh +# bit15-12: 1111 required +# bit31-16: 0 required + +DATA 0xFFD01428 0x00085520 # DDR2 ODT Read Timing (default values) +DATA 0xFFD0147C 0x00008552 # DDR2 ODT Write Timing (default values) + +DATA 0xFFD01500 0x00000000 # CS[0]n Base address to 0x0 +DATA 0xFFD01504 0x07FFFFF1 # CS[0]n Size +# bit0: 1, Window enabled +# bit1: 0, Write Protect disabled +# bit3-2: 00, CS0 hit selected +# bit23-4: ones, required +# bit31-24: 0x07, Size (i.e. 128MB) + +DATA 0xFFD01508 0x10000000 # CS[1]n Base address to 256Mb +DATA 0xFFD0150C 0x00000000 # CS[1]n Size, window disabled + +DATA 0xFFD01514 0x00000000 # CS[2]n Size, window disabled +DATA 0xFFD0151C 0x00000000 # CS[3]n Size, window disabled + +DATA 0xFFD01494 0x00030000 # DDR ODT Control (Low) +DATA 0xFFD01498 0x00000000 # DDR ODT Control (High) +# bit1-0: 00, ODT0 controlled by ODT Control (low) register above +# bit3-2: 01, ODT1 active NEVER! +# bit31-4: zero, required + +DATA 0xFFD0149C 0x0000E803 # CPU ODT Control +DATA 0xFFD01480 0x00000001 # DDR Initialization Control +#bit0=1, enable DDR init upon this register write + +# End of Header extension +DATA 0x0 0x0
Start with the dockstar file. In all the #defines cosmetically change DOCKSTAR to GOFLEXHOME
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhome.h | 47 +++++++++++++++++++++++++++++++++ 1 files changed, 47 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/goflexhome.h
diff --git a/board/Seagate/goflexhome/goflexhome.h b/board/Seagate/goflexhome/goflexhome.h new file mode 100644 index 0000000..2af2596 --- /dev/null +++ b/board/Seagate/goflexhome/goflexhome.h @@ -0,0 +1,47 @@ +/* + * Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com + * + * Based on dockstar.h originally written by + * Copyright (C) 2010 Eric C. Cooper ecc@cmu.edu + * + * Based on sheevaplug.h originally written by + * Prafulla Wadaskar prafulla@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#ifndef __GOFLEXHOME_H +#define __GOFLEXHOME_H + +#define GOFLEXHOME_OE_LOW (~(0)) +#define GOFLEXHOME_OE_HIGH (~(0)) +#define GOFLEXHOME_OE_VAL_LOW (1 << 29) /* USB_PWEN low */ +#define GOFLEXHOME_OE_VAL_HIGH (1 << 17) /* LED pin high */ + +/* PHY related */ +#define MV88E1116_LED_FCTRL_REG 10 +#define MV88E1116_CPRSP_CR3_REG 21 +#define MV88E1116_MAC_CTRL_REG 21 +#define MV88E1116_PGADR_REG 22 +#define MV88E1116_RGMII_TXTM_CTRL (1 << 4) +#define MV88E1116_RGMII_RXTM_CTRL (1 << 5) + +#endif /* __GOFLEXHOME_H */
Start with the dockstar file. Include goflexhome.h instead of dockstar.h Change #define DOCKSTAR_* to #define GOFLEXHOME_* Change the MACH_TYPE_DOCKSTAR to MACH_TYPE_GOFLEXHOME to reflect that its a GoFlexHome.
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes in v2: Coding style changes
board/Seagate/goflexhome/goflexhome.c | 187 +++++++++++++++++++++++++++++++++ 1 files changed, 187 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/goflexhome.c
diff --git a/board/Seagate/goflexhome/goflexhome.c b/board/Seagate/goflexhome/goflexhome.c new file mode 100644 index 0000000..c1314fb --- /dev/null +++ b/board/Seagate/goflexhome/goflexhome.c @@ -0,0 +1,187 @@ +/* + * Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com + * + * Based on dockstar.c originally written by + * Copyright (C) 2010 Eric C. Cooper ecc@cmu.edu + * + * Based on sheevaplug.c originally written by + * Prafulla Wadaskar prafulla@marvell.com + * (C) Copyright 2009 + * Marvell Semiconductor <www.marvell.com> + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <common.h> +#include <miiphy.h> +#include <asm/arch/kirkwood.h> +#include <asm/arch/mpp.h> +#include <asm/arch/cpu.h> +#include <asm/io.h> +#include "goflexhome.h" + + +DECLARE_GLOBAL_DATA_PTR; + +int board_early_init_f(void) +{ + /* + * default gpio configuration + * There are maximum 64 gpios controlled through 2 sets of registers + * the below configuration configures mainly initial LED status + */ + kw_config_gpio(GOFLEXHOME_OE_VAL_LOW, + GOFLEXHOME_OE_VAL_HIGH, + GOFLEXHOME_OE_LOW, GOFLEXHOME_OE_HIGH); + + /* Multi-Purpose Pins Functionality configuration */ + static const u32 kwmpp_config[] = { + MPP0_NF_IO2, + MPP1_NF_IO3, + MPP2_NF_IO4, + MPP3_NF_IO5, + MPP4_NF_IO6, + MPP5_NF_IO7, + MPP6_SYSRST_OUTn, + MPP7_GPO, + MPP8_UART0_RTS, + MPP9_UART0_CTS, + MPP10_UART0_TXD, + MPP11_UART0_RXD, + MPP12_SD_CLK, + MPP13_SD_CMD, + MPP14_SD_D0, + MPP15_SD_D1, + MPP16_SD_D2, + MPP17_SD_D3, + MPP18_NF_IO0, + MPP19_NF_IO1, + MPP20_GPIO, + MPP21_GPIO, + MPP22_GPIO, + MPP23_GPIO, + MPP24_GPIO, + MPP25_GPIO, + MPP26_GPIO, + MPP27_GPIO, + MPP28_GPIO, + MPP29_TSMP9, + MPP30_GPIO, + MPP31_GPIO, + MPP32_GPIO, + MPP33_GPIO, + MPP34_GPIO, + MPP35_GPIO, + MPP36_GPIO, + MPP37_GPIO, + MPP38_GPIO, + MPP39_GPIO, + MPP40_GPIO, + MPP41_GPIO, + MPP42_GPIO, + MPP43_GPIO, + MPP44_GPIO, + MPP45_GPIO, + MPP46_GPIO, + MPP47_GPIO, + MPP48_GPIO, + MPP49_GPIO, + 0 + }; + kirkwood_mpp_conf(kwmpp_config, NULL); + return 0; +} + +int board_init(void) +{ + /* + * arch number of board + */ + gd->bd->bi_arch_number = MACH_TYPE_GOFLEXHOME; + + /* address of boot parameters */ + gd->bd->bi_boot_params = kw_sdram_bar(0) + 0x100; + + return 0; +} + +#ifdef CONFIG_RESET_PHY_R +/* Configure and enable MV88E1116 PHY */ +void reset_phy(void) +{ + u16 reg; + u16 devadr; + char *name = "egiga0"; + + if (miiphy_set_current_dev(name)) + return; + + /* command to read PHY dev address */ + if (miiphy_read(name, 0xEE, 0xEE, (u16 *)&devadr)) { + printf("Err..%s could not read PHY dev address\n", + __func__); + return; + } + + /* + * Enable RGMII delay on Tx and Rx for CPU port + * Ref: sec 4.7.2 of chip datasheet + */ + miiphy_write(name, devadr, MV88E1116_PGADR_REG, 2); + miiphy_read(name, devadr, MV88E1116_MAC_CTRL_REG, ®); + reg |= (MV88E1116_RGMII_RXTM_CTRL | MV88E1116_RGMII_TXTM_CTRL); + miiphy_write(name, devadr, MV88E1116_MAC_CTRL_REG, reg); + miiphy_write(name, devadr, MV88E1116_PGADR_REG, 0); + + /* reset the phy */ + miiphy_reset(name, devadr); + + printf("88E1116 Initialized on %s\n", name); +} +#endif /* CONFIG_RESET_PHY_R */ + +#define GREEN_LED (1 << 14) +#define ORANGE_LED (1 << 15) +#define BOTH_LEDS (GREEN_LED | ORANGE_LED) +#define NEITHER_LED 0 + +static void set_leds(u32 leds, u32 blinking) +{ + struct kwgpio_registers *r = (struct kwgpio_registers *)KW_GPIO1_BASE; + u32 oe = readl(&r->oe) | BOTH_LEDS; + writel(oe & ~leds, &r->oe); /* active low */ + u32 bl = readl(&r->blink_en) & ~BOTH_LEDS; + writel(bl | blinking, &r->blink_en); +} + +void show_boot_progress(int val) +{ + switch (val) { + case BOOTSTAGE_ID_RUN_OS: /* booting Linux */ + set_leds(BOTH_LEDS, NEITHER_LED); + break; + case BOOTSTAGE_ID_NET_ETH_START: /* Ethernet initialization */ + set_leds(GREEN_LED, GREEN_LED); + break; + default: + if (val < 0) /* error */ + set_leds(ORANGE_LED, ORANGE_LED); + break; + } +}
Initialize usb and ide. Scan through the usb for storage and boot capable partitions. Scan through the ide interface for boot capable partitions. Present such bootable options to the user to choose to boot from If the user does not choose any choose the default option the default option is the option chosen by the user the last time If no such default option exists, boot from the first possible bootable option.
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com --- Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhomemenu.c | 415 +++++++++++++++++++++++++++++ 1 files changed, 415 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/goflexhomemenu.c
diff --git a/board/Seagate/goflexhome/goflexhomemenu.c b/board/Seagate/goflexhome/goflexhomemenu.c new file mode 100644 index 0000000..6169cf8 --- /dev/null +++ b/board/Seagate/goflexhome/goflexhomemenu.c @@ -0,0 +1,415 @@ +/* + * Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, + * MA 02110-1301 USA + */ + +#include <common.h> + +#if defined(CONFIG_MENU) +/* Menu related code begins here */ + +/* Added to use the various usb/fat/ext4fs interfaces */ +#include <usb.h> +#include <ext4fs.h> +#include <menu.h> + +#define MENU_MAX_DEVICES 10 +#define MENU_MAX_PARTITIONS 10 +#define MENU_MAX_BOOTABLES 10 + +#define MENU_EXIT 1 +#define MENU_SHOW 2 + +#define MENU_DEFAULT_BOOTARGS \ + "setenv bootargs ${console} ubi.mtd=2,2048 " \ + "root=ubi0:root rootfstype=ubifs debug" + +#define MENU_DEFAULT_BOOTCMD \ + "setenv bootcmd nand read.e 0x800000 0x100000 0x600000" + +#define MENU_PROMPT_BOOTCMD \ + "setenv bootcmd echo Dropping you to u-boot" + +#define MENU_CHOSEN_BOOTARGS \ + "setenv bootargs $console rootdelay=10 root=${menu_root} debug" + +#define MENU_OPTIONS_HEADER \ + "Bootables:\nChoice\tIntface\tDrive\tDevice\tPart\tFS\tFileName\n" \ + "---------------------------------------------------------------" + +#define MENU_DEFAULT_NOBOOTABLES \ + "* Last boot options (None, and no bootables found!" + +struct menu_bootables { + char interface[5]; + char drive; + int device; + int partition; + char filename[64]; + char fstype; /* f => fat, e => ext2/4 0 => invalid */ +}; + +static void goflexhome_menuprint(void *print_buffer) +{ + printf("%s\n", (char *)print_buffer); +} + +/* + * We shall use menu_<> variables to capture the state of past menu + * choices. + * menu_bootargs corresponds to bootargs + * menu_bootcmd corresponds to bootcmd + * menu_choice corresponds to the last choice that was picked + * menu_choice will be NULL the first time and also + * if a choice was never made. In that case we should pick + * to boot from the 1st bootable option if present. +*/ +static int goflexhome_evaluate_env(void) +{ +char *s; + + run_command("run menu_bootargs", 0); + s = getenv("bootargs"); + printf("bootargs is %s\n", s); + run_command("run menu_bootcmd", 0); + s = getenv("bootcmd"); + printf("bootcmd is %s\n", s); + if (run_command("run bootcmd", 0) != 0) { + /* We failed to boot, present the menu */ + return MENU_SHOW; + } + if (strncmp(s, "echo", 4) == 0) { + /* User wants the u-boot prmpt */ + return MENU_EXIT; + } + run_command("bootm", 0); + + /* We are here, we failed to boot */ + return MENU_SHOW; +} + +static int goflexhome_handle_choice(struct menu_bootables menu_bootlist[], + char *choice) +{ +char *s, *last_menu_choice; +char menu_command[128]; +char load_command[16]; +int index; +int call_saveenv; + + call_saveenv = 0; + if (choice == NULL) { + /* Exit menu and let it do its auto boot */ + return MENU_EXIT; + } + printf("\nYou chose: %s\n", choice); + + last_menu_choice = getenv("menu_choice"); + if (last_menu_choice == NULL) { + /* User has not yet chosen before */ + /* Lets default to boot from nand */ + setenv("menu_bootargs", MENU_DEFAULT_BOOTARGS); + setenv("menu_bootcmd", MENU_DEFAULT_BOOTCMD); + call_saveenv = 1; + } + if (choice[0] == '*') { + /* User wants same thing that was chosen the last time */ + return MENU_EXIT; + } + if (last_menu_choice && strcmp(choice, last_menu_choice) != 0) { + /* Save the choice chosen */ + setenv("menu_choice", choice); + call_saveenv = 1; + } + if (choice[0] == '+') { + /* User wants u-boot prompt */ + s = getenv("menu_bootcmd"); + if (strcmp(s, MENU_PROMPT_BOOTCMD) != 0) { + setenv("menu_bootcmd", MENU_PROMPT_BOOTCMD); + saveenv(); + } + return MENU_EXIT; + } + + /* Steps to set the env variables to the chosen values */ + index = simple_strtoul(choice, NULL, 10); + sprintf(menu_command, "/dev/sd%c%d", menu_bootlist[index].drive, + menu_bootlist[index].partition); + s = getenv("menu_root"); + if (strcmp(s, menu_command) != 0) { + setenv("menu_root", menu_command); + call_saveenv = 1; + } + s = getenv("menu_bootargs"); + if (strcmp(s, MENU_CHOSEN_BOOTARGS) != 0) { + setenv("menu_bootargs", MENU_CHOSEN_BOOTARGS); + call_saveenv = 1; + } + switch (menu_bootlist[index].fstype) { + case 'e': + strcpy(load_command, "ext4load"); + break; + default: + return MENU_EXIT; + } + + /* Lets try to load and check the image */ + sprintf(menu_command, "%s %s %d:%d %x %s", + load_command, + menu_bootlist[index].interface, + menu_bootlist[index].device, + menu_bootlist[index].partition, + CONFIG_SYS_LOAD_ADDR, + menu_bootlist[index].filename); + if (run_command(menu_command, 0) != 0) { + /* Could not load image */ + printf("Selected image could not be loaded ...\n"); + return MENU_SHOW; + } + sprintf(menu_command, "iminfo %x", CONFIG_SYS_LOAD_ADDR); + if (run_command(menu_command, 0) != 0) { + /* The image is not a valid image */ + printf("Selected image is not valid ...\n"); + return MENU_SHOW; + } + + sprintf(menu_command, "setenv bootcmd %s %s %d:%d %x %s", + load_command, + menu_bootlist[index].interface, + menu_bootlist[index].device, + menu_bootlist[index].partition, + CONFIG_SYS_LOAD_ADDR, + menu_bootlist[index].filename); + s = getenv("menu_bootcmd"); + if (strcmp(s, menu_command) != 0) { + setenv("menu_bootcmd", menu_command); + call_saveenv = 1; + } + if (call_saveenv) + saveenv(); + return MENU_EXIT; +} + +static int goflexhome_menu(struct menu_bootables menu_bootlist[], int bootdelay) +{ +int index; +struct menu *m; +char menu_key[MENU_MAX_BOOTABLES][5]; +char menu_entry[MENU_MAX_BOOTABLES][64]; +char *menu_choice; +char *last_menu_choice; +char choice_menu_entry[64]; +char choice_menu[3]; + + m = menu_create(MENU_OPTIONS_HEADER, 60, 1, goflexhome_menuprint, + NULL, NULL); + for (index = 0; index < MENU_MAX_BOOTABLES; index++) { + if (menu_bootlist[index].fstype == '0') + break; + snprintf(menu_key[index], sizeof(menu_key[index]), "%d", index); + snprintf(menu_entry[index], sizeof(menu_entry[index]), + "%d\t%s\t%c\t%d\t%d\t%c\t%s", index, + menu_bootlist[index].interface, + menu_bootlist[index].drive, + menu_bootlist[index].device, + menu_bootlist[index].partition, + menu_bootlist[index].fstype, + menu_bootlist[index].filename); + if (menu_item_add(m, menu_key[index], menu_entry[index]) != 1) { + menu_destroy(m); + return MENU_EXIT; + } + } + + /* Prep for what should be the default menu choice */ + /* If chosen before, choose the last boot options */ + /* If nothing chosen yet, then choose the first bootable option */ + /* If nothing chosen yet, and no first bootable option, then boot */ + /* from nand */ + last_menu_choice = getenv("menu_choice"); + sprintf(choice_menu, "*"); + if (last_menu_choice) { + sprintf(choice_menu_entry, "* Last boot options (%s)", + last_menu_choice); + } else { + /* There was no last boot option */ + /* If there is at least 1 boot entry, make that the default */ + if (menu_bootlist[0].fstype != '0') { + setenv("menu_choice", menu_entry[0]); + sprintf(choice_menu_entry, menu_entry[0]); + } else { + sprintf(choice_menu_entry, MENU_DEFAULT_NOBOOTABLES); + } + } + if (menu_item_add(m, choice_menu, choice_menu_entry) != 1) { + menu_destroy(m); + return MENU_EXIT; + } + /* Mark this as the default choice. */ + menu_default_set(m, "*"); + if (menu_item_add(m, "+", "+ UBoot prompt") != 1) { + menu_destroy(m); + return MENU_EXIT; + } + + menu_get_choice(m, (void **)&menu_choice); + return goflexhome_handle_choice(menu_bootlist, menu_choice); +} + +static void goflexhome_filesearch(struct menu_bootables menu_bootlist[], + int *bootindex) { +char *filenames[] = { "/uImage", "/boot/uImage", "" }; +int index; + + index = 0; + while (filenames[index][0] != '\0') { + switch (menu_bootlist[*bootindex].fstype) { + case 'e': + if (ext4fs_open(filenames[index]) == -1) { + index++; + continue; + } + break; + + default: + break; + } + + /* Got a hit, record it */ + strcpy(menu_bootlist[*bootindex].filename, filenames[index]); + index++; + (*bootindex)++; + if (*bootindex >= MENU_MAX_BOOTABLES) + break; + /* Prep next bootlist structure */ + memcpy(&menu_bootlist[*bootindex], + &menu_bootlist[*bootindex - 1], + sizeof(struct menu_bootables)); + } +} + +static void goflexhome_populate_partitions(struct menu_bootables *menu_bootlist, + block_dev_desc_t *dev_desc, + int *bootindex) +{ +int part; +disk_partition_t disk_part; + + part = menu_bootlist[*bootindex].partition; + + /* Get the partition structure */ + if (get_partition_info(dev_desc, part, &disk_part)) + return; + + /* Try to check if its extX */ + if (ext4fs_probe(dev_desc, &disk_part) == 0) { + menu_bootlist[*bootindex].fstype = 'e'; + goflexhome_filesearch(menu_bootlist, bootindex); + ext4fs_close(); + return; + } +} + +static void goflexhome_populate_devices(struct menu_bootables menu_bootlist[], + int *bootindex) +{ +block_dev_desc_t *dev_desc; +int device; +int part; + + /* Populate bootlist from each device and the partitions within */ + for (device = 0; device < MENU_MAX_DEVICES; device++) { + dev_desc = get_dev(menu_bootlist[*bootindex].interface, device); + if (dev_desc == NULL) + continue; + menu_bootlist[*bootindex].device = device; + for (part = 0; part < MENU_MAX_PARTITIONS; part++) { + menu_bootlist[*bootindex].partition = part; + goflexhome_populate_partitions(menu_bootlist, dev_desc, + bootindex); + } + } +} + +/* menu_bootlist[] can hold a max of MENU_MAX_BOOTABLES entries */ +static void goflexhome_populate_bootlist(struct menu_bootables menu_bootlist[]) +{ +/* ide is always first */ +char *interfaces[] = { "ide", "usb", "" }; +int bootindex; +int i; + + bootindex = 0; + i = 0; + /* Lets initialize the usb sub system */ + usb_init(); + usb_stor_scan(0); + + /* This scans the partitions in the IDE storage */ + ide_init(); + + /* Populate bootlist from each interface */ + while ((interfaces[i][0] != '\0') && + (bootindex < MENU_MAX_BOOTABLES)) { + strcpy(menu_bootlist[bootindex].interface, interfaces[i]); + goflexhome_populate_devices(menu_bootlist, &bootindex); + i++; + } + if (bootindex < MENU_MAX_BOOTABLES) { + /* End marker of list */ + menu_bootlist[bootindex].fstype = '0'; + } + + /* Lets set the drive letter */ + menu_bootlist[0].drive = 'a'; + for (i = 1; i < bootindex; i++) { + if (menu_bootlist[i].fstype == '0') + break; + /* Increase drive letter when interface changes */ + /* Or when device numbers change for same interface */ + menu_bootlist[i].drive = menu_bootlist[i - 1].drive; + if (strcmp(menu_bootlist[i].interface, + menu_bootlist[i - 1].interface) != 0) { + menu_bootlist[i].drive++; + } else { + if (menu_bootlist[i].device > + menu_bootlist[i - 1].device) { + menu_bootlist[i].drive++; + } + } + } +} + +int menu_show(int bootdelay) +{ +struct menu_bootables menu_bootlist[MENU_MAX_BOOTABLES]; +int retval; + + goflexhome_populate_bootlist(menu_bootlist); + do { + retval = goflexhome_menu(menu_bootlist, bootdelay); + if (retval == MENU_EXIT) + retval = goflexhome_evaluate_env(); + } while (retval == MENU_SHOW); + + return 0; +} + +#endif /* CONFIG_MENU */
On Wed, Apr 10, 2013 at 8:12 AM, Suriyan Ramasami suriyan.r@gmail.com wrote:
Initialize usb and ide. Scan through the usb for storage and boot capable partitions. Scan through the ide interface for boot capable partitions. Present such bootable options to the user to choose to boot from If the user does not choose any choose the default option the default option is the option chosen by the user the last time If no such default option exists, boot from the first possible bootable option.
This all sounds very generic but...
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com
Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhomemenu.c | 415 +++++++++++++++++++++++++++++
but this is not a generic location. This feature would interest me and probably Stephen as well.
Rob
1 files changed, 415 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/goflexhomemenu.c
diff --git a/board/Seagate/goflexhome/goflexhomemenu.c b/board/Seagate/goflexhome/goflexhomemenu.c new file mode 100644 index 0000000..6169cf8 --- /dev/null +++ b/board/Seagate/goflexhome/goflexhomemenu.c @@ -0,0 +1,415 @@ +/*
- Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com
- See file CREDITS for list of people who contributed to this
- project.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA
- */
+#include <common.h>
+#if defined(CONFIG_MENU) +/* Menu related code begins here */
+/* Added to use the various usb/fat/ext4fs interfaces */ +#include <usb.h> +#include <ext4fs.h> +#include <menu.h>
+#define MENU_MAX_DEVICES 10 +#define MENU_MAX_PARTITIONS 10 +#define MENU_MAX_BOOTABLES 10
+#define MENU_EXIT 1 +#define MENU_SHOW 2
+#define MENU_DEFAULT_BOOTARGS \
"setenv bootargs ${console} ubi.mtd=2,2048 " \"root=ubi0:root rootfstype=ubifs debug"+#define MENU_DEFAULT_BOOTCMD \
"setenv bootcmd nand read.e 0x800000 0x100000 0x600000"+#define MENU_PROMPT_BOOTCMD \
"setenv bootcmd echo Dropping you to u-boot"+#define MENU_CHOSEN_BOOTARGS \
"setenv bootargs $console rootdelay=10 root=${menu_root} debug"+#define MENU_OPTIONS_HEADER \
"Bootables:\nChoice\tIntface\tDrive\tDevice\tPart\tFS\tFileName\n" \"---------------------------------------------------------------"+#define MENU_DEFAULT_NOBOOTABLES \
"* Last boot options (None, and no bootables found!"+struct menu_bootables {
char interface[5];char drive;int device;int partition;char filename[64];char fstype; /* f => fat, e => ext2/4 0 => invalid */+};
+static void goflexhome_menuprint(void *print_buffer) +{
printf("%s\n", (char *)print_buffer);+}
+/*
- We shall use menu_<> variables to capture the state of past menu
- choices.
- menu_bootargs corresponds to bootargs
- menu_bootcmd corresponds to bootcmd
- menu_choice corresponds to the last choice that was picked
- menu_choice will be NULL the first time and also
- if a choice was never made. In that case we should pick
- to boot from the 1st bootable option if present.
+*/ +static int goflexhome_evaluate_env(void) +{ +char *s;
run_command("run menu_bootargs", 0);s = getenv("bootargs");printf("bootargs is %s\n", s);run_command("run menu_bootcmd", 0);s = getenv("bootcmd");printf("bootcmd is %s\n", s);if (run_command("run bootcmd", 0) != 0) {/* We failed to boot, present the menu */return MENU_SHOW;}if (strncmp(s, "echo", 4) == 0) {/* User wants the u-boot prmpt */return MENU_EXIT;}run_command("bootm", 0);/* We are here, we failed to boot */return MENU_SHOW;+}
+static int goflexhome_handle_choice(struct menu_bootables menu_bootlist[],
char *choice)+{ +char *s, *last_menu_choice; +char menu_command[128]; +char load_command[16]; +int index; +int call_saveenv;
call_saveenv = 0;if (choice == NULL) {/* Exit menu and let it do its auto boot */return MENU_EXIT;}printf("\nYou chose: %s\n", choice);last_menu_choice = getenv("menu_choice");if (last_menu_choice == NULL) {/* User has not yet chosen before *//* Lets default to boot from nand */setenv("menu_bootargs", MENU_DEFAULT_BOOTARGS);setenv("menu_bootcmd", MENU_DEFAULT_BOOTCMD);call_saveenv = 1;}if (choice[0] == '*') {/* User wants same thing that was chosen the last time */return MENU_EXIT;}if (last_menu_choice && strcmp(choice, last_menu_choice) != 0) {/* Save the choice chosen */setenv("menu_choice", choice);call_saveenv = 1;}if (choice[0] == '+') {/* User wants u-boot prompt */s = getenv("menu_bootcmd");if (strcmp(s, MENU_PROMPT_BOOTCMD) != 0) {setenv("menu_bootcmd", MENU_PROMPT_BOOTCMD);saveenv();}return MENU_EXIT;}/* Steps to set the env variables to the chosen values */index = simple_strtoul(choice, NULL, 10);sprintf(menu_command, "/dev/sd%c%d", menu_bootlist[index].drive,menu_bootlist[index].partition);s = getenv("menu_root");if (strcmp(s, menu_command) != 0) {setenv("menu_root", menu_command);call_saveenv = 1;}s = getenv("menu_bootargs");if (strcmp(s, MENU_CHOSEN_BOOTARGS) != 0) {setenv("menu_bootargs", MENU_CHOSEN_BOOTARGS);call_saveenv = 1;}switch (menu_bootlist[index].fstype) {case 'e':strcpy(load_command, "ext4load");break;default:return MENU_EXIT;}/* Lets try to load and check the image */sprintf(menu_command, "%s %s %d:%d %x %s",load_command,menu_bootlist[index].interface,menu_bootlist[index].device,menu_bootlist[index].partition,CONFIG_SYS_LOAD_ADDR,menu_bootlist[index].filename);if (run_command(menu_command, 0) != 0) {/* Could not load image */printf("Selected image could not be loaded ...\n");return MENU_SHOW;}sprintf(menu_command, "iminfo %x", CONFIG_SYS_LOAD_ADDR);if (run_command(menu_command, 0) != 0) {/* The image is not a valid image */printf("Selected image is not valid ...\n");return MENU_SHOW;}sprintf(menu_command, "setenv bootcmd %s %s %d:%d %x %s",load_command,menu_bootlist[index].interface,menu_bootlist[index].device,menu_bootlist[index].partition,CONFIG_SYS_LOAD_ADDR,menu_bootlist[index].filename);s = getenv("menu_bootcmd");if (strcmp(s, menu_command) != 0) {setenv("menu_bootcmd", menu_command);call_saveenv = 1;}if (call_saveenv)saveenv();return MENU_EXIT;+}
+static int goflexhome_menu(struct menu_bootables menu_bootlist[], int bootdelay) +{ +int index; +struct menu *m; +char menu_key[MENU_MAX_BOOTABLES][5]; +char menu_entry[MENU_MAX_BOOTABLES][64]; +char *menu_choice; +char *last_menu_choice; +char choice_menu_entry[64]; +char choice_menu[3];
m = menu_create(MENU_OPTIONS_HEADER, 60, 1, goflexhome_menuprint,NULL, NULL);for (index = 0; index < MENU_MAX_BOOTABLES; index++) {if (menu_bootlist[index].fstype == '0')break;snprintf(menu_key[index], sizeof(menu_key[index]), "%d", index);snprintf(menu_entry[index], sizeof(menu_entry[index]),"%d\t%s\t%c\t%d\t%d\t%c\t%s", index,menu_bootlist[index].interface,menu_bootlist[index].drive,menu_bootlist[index].device,menu_bootlist[index].partition,menu_bootlist[index].fstype,menu_bootlist[index].filename);if (menu_item_add(m, menu_key[index], menu_entry[index]) != 1) {menu_destroy(m);return MENU_EXIT;}}/* Prep for what should be the default menu choice *//* If chosen before, choose the last boot options *//* If nothing chosen yet, then choose the first bootable option *//* If nothing chosen yet, and no first bootable option, then boot *//* from nand */last_menu_choice = getenv("menu_choice");sprintf(choice_menu, "*");if (last_menu_choice) {sprintf(choice_menu_entry, "* Last boot options (%s)",last_menu_choice);} else {/* There was no last boot option *//* If there is at least 1 boot entry, make that the default */if (menu_bootlist[0].fstype != '0') {setenv("menu_choice", menu_entry[0]);sprintf(choice_menu_entry, menu_entry[0]);} else {sprintf(choice_menu_entry, MENU_DEFAULT_NOBOOTABLES);}}if (menu_item_add(m, choice_menu, choice_menu_entry) != 1) {menu_destroy(m);return MENU_EXIT;}/* Mark this as the default choice. */menu_default_set(m, "*");if (menu_item_add(m, "+", "+ UBoot prompt") != 1) {menu_destroy(m);return MENU_EXIT;}menu_get_choice(m, (void **)&menu_choice);return goflexhome_handle_choice(menu_bootlist, menu_choice);+}
+static void goflexhome_filesearch(struct menu_bootables menu_bootlist[],
int *bootindex) {+char *filenames[] = { "/uImage", "/boot/uImage", "" }; +int index;
index = 0;while (filenames[index][0] != '\0') {switch (menu_bootlist[*bootindex].fstype) {case 'e':if (ext4fs_open(filenames[index]) == -1) {index++;continue;}break;default:break;}/* Got a hit, record it */strcpy(menu_bootlist[*bootindex].filename, filenames[index]);index++;(*bootindex)++;if (*bootindex >= MENU_MAX_BOOTABLES)break;/* Prep next bootlist structure */memcpy(&menu_bootlist[*bootindex],&menu_bootlist[*bootindex - 1],sizeof(struct menu_bootables));}+}
+static void goflexhome_populate_partitions(struct menu_bootables *menu_bootlist,
block_dev_desc_t *dev_desc,int *bootindex)+{ +int part; +disk_partition_t disk_part;
part = menu_bootlist[*bootindex].partition;/* Get the partition structure */if (get_partition_info(dev_desc, part, &disk_part))return;/* Try to check if its extX */if (ext4fs_probe(dev_desc, &disk_part) == 0) {menu_bootlist[*bootindex].fstype = 'e';goflexhome_filesearch(menu_bootlist, bootindex);ext4fs_close();return;}+}
+static void goflexhome_populate_devices(struct menu_bootables menu_bootlist[],
int *bootindex)+{ +block_dev_desc_t *dev_desc; +int device; +int part;
/* Populate bootlist from each device and the partitions within */for (device = 0; device < MENU_MAX_DEVICES; device++) {dev_desc = get_dev(menu_bootlist[*bootindex].interface, device);if (dev_desc == NULL)continue;menu_bootlist[*bootindex].device = device;for (part = 0; part < MENU_MAX_PARTITIONS; part++) {menu_bootlist[*bootindex].partition = part;goflexhome_populate_partitions(menu_bootlist, dev_desc,bootindex);}}+}
+/* menu_bootlist[] can hold a max of MENU_MAX_BOOTABLES entries */ +static void goflexhome_populate_bootlist(struct menu_bootables menu_bootlist[]) +{ +/* ide is always first */ +char *interfaces[] = { "ide", "usb", "" }; +int bootindex; +int i;
bootindex = 0;i = 0;/* Lets initialize the usb sub system */usb_init();usb_stor_scan(0);/* This scans the partitions in the IDE storage */ide_init();/* Populate bootlist from each interface */while ((interfaces[i][0] != '\0') &&(bootindex < MENU_MAX_BOOTABLES)) {strcpy(menu_bootlist[bootindex].interface, interfaces[i]);goflexhome_populate_devices(menu_bootlist, &bootindex);i++;}if (bootindex < MENU_MAX_BOOTABLES) {/* End marker of list */menu_bootlist[bootindex].fstype = '0';}/* Lets set the drive letter */menu_bootlist[0].drive = 'a';for (i = 1; i < bootindex; i++) {if (menu_bootlist[i].fstype == '0')break;/* Increase drive letter when interface changes *//* Or when device numbers change for same interface */menu_bootlist[i].drive = menu_bootlist[i - 1].drive;if (strcmp(menu_bootlist[i].interface,menu_bootlist[i - 1].interface) != 0) {menu_bootlist[i].drive++;} else {if (menu_bootlist[i].device >menu_bootlist[i - 1].device) {menu_bootlist[i].drive++;}}}+}
+int menu_show(int bootdelay) +{ +struct menu_bootables menu_bootlist[MENU_MAX_BOOTABLES]; +int retval;
goflexhome_populate_bootlist(menu_bootlist);do {retval = goflexhome_menu(menu_bootlist, bootdelay);if (retval == MENU_EXIT)retval = goflexhome_evaluate_env();} while (retval == MENU_SHOW);return 0;+}
+#endif /* CONFIG_MENU */
1.7.1
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
I shall probably move it to a generic location with a more generic name. Any reocmmendations?
- Suriyan
On Wed, Apr 10, 2013 at 6:43 PM, Rob Herring robherring2@gmail.com wrote:
On Wed, Apr 10, 2013 at 8:12 AM, Suriyan Ramasami suriyan.r@gmail.com wrote:
Initialize usb and ide. Scan through the usb for storage and boot capable partitions. Scan through the ide interface for boot capable partitions. Present such bootable options to the user to choose to boot from If the user does not choose any choose the default option the default option is the option chosen by the user the last time If no such default option exists, boot from the first possible bootable option.
This all sounds very generic but...
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com
Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhomemenu.c | 415
+++++++++++++++++++++++++++++
but this is not a generic location. This feature would interest me and probably Stephen as well.
Rob
1 files changed, 415 insertions(+), 0 deletions(-) create mode 100644 board/Seagate/goflexhome/goflexhomemenu.c
diff --git a/board/Seagate/goflexhome/goflexhomemenu.c
b/board/Seagate/goflexhome/goflexhomemenu.c
new file mode 100644 index 0000000..6169cf8 --- /dev/null +++ b/board/Seagate/goflexhome/goflexhomemenu.c @@ -0,0 +1,415 @@ +/*
- Copyright (C) 2013 Suriyan Ramasami suriyan.r@gmail.com
- See file CREDITS for list of people who contributed to this
- project.
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU General Public License as
- published by the Free Software Foundation; either version 2 of
- the License, or (at your option) any later version.
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
- You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
- MA 02110-1301 USA
- */
+#include <common.h>
+#if defined(CONFIG_MENU) +/* Menu related code begins here */
+/* Added to use the various usb/fat/ext4fs interfaces */ +#include <usb.h> +#include <ext4fs.h> +#include <menu.h>
+#define MENU_MAX_DEVICES 10 +#define MENU_MAX_PARTITIONS 10 +#define MENU_MAX_BOOTABLES 10
+#define MENU_EXIT 1 +#define MENU_SHOW 2
+#define MENU_DEFAULT_BOOTARGS \
"setenv bootargs ${console} ubi.mtd=2,2048 " \"root=ubi0:root rootfstype=ubifs debug"+#define MENU_DEFAULT_BOOTCMD \
"setenv bootcmd nand read.e 0x800000 0x100000 0x600000"+#define MENU_PROMPT_BOOTCMD \
"setenv bootcmd echo Dropping you to u-boot"+#define MENU_CHOSEN_BOOTARGS \
"setenv bootargs $console rootdelay=10 root=${menu_root} debug"+#define MENU_OPTIONS_HEADER \
"Bootables:\nChoice\tIntface\tDrive\tDevice\tPart\tFS\tFileName\n" \
"---------------------------------------------------------------"+#define MENU_DEFAULT_NOBOOTABLES \
"* Last boot options (None, and no bootables found!"+struct menu_bootables {
char interface[5];char drive;int device;int partition;char filename[64];char fstype; /* f => fat, e => ext2/4 0 => invalid */+};
+static void goflexhome_menuprint(void *print_buffer) +{
printf("%s\n", (char *)print_buffer);+}
+/*
- We shall use menu_<> variables to capture the state of past menu
- choices.
- menu_bootargs corresponds to bootargs
- menu_bootcmd corresponds to bootcmd
- menu_choice corresponds to the last choice that was picked
- menu_choice will be NULL the first time and also
- if a choice was never made. In that case we should pick
- to boot from the 1st bootable option if present.
+*/ +static int goflexhome_evaluate_env(void) +{ +char *s;
run_command("run menu_bootargs", 0);s = getenv("bootargs");printf("bootargs is %s\n", s);run_command("run menu_bootcmd", 0);s = getenv("bootcmd");printf("bootcmd is %s\n", s);if (run_command("run bootcmd", 0) != 0) {/* We failed to boot, present the menu */return MENU_SHOW;}if (strncmp(s, "echo", 4) == 0) {/* User wants the u-boot prmpt */return MENU_EXIT;}run_command("bootm", 0);/* We are here, we failed to boot */return MENU_SHOW;+}
+static int goflexhome_handle_choice(struct menu_bootables
menu_bootlist[],
char *choice)+{ +char *s, *last_menu_choice; +char menu_command[128]; +char load_command[16]; +int index; +int call_saveenv;
call_saveenv = 0;if (choice == NULL) {/* Exit menu and let it do its auto boot */return MENU_EXIT;}printf("\nYou chose: %s\n", choice);last_menu_choice = getenv("menu_choice");if (last_menu_choice == NULL) {/* User has not yet chosen before *//* Lets default to boot from nand */setenv("menu_bootargs", MENU_DEFAULT_BOOTARGS);setenv("menu_bootcmd", MENU_DEFAULT_BOOTCMD);call_saveenv = 1;}if (choice[0] == '*') {/* User wants same thing that was chosen the last time */return MENU_EXIT;}if (last_menu_choice && strcmp(choice, last_menu_choice) != 0) {/* Save the choice chosen */setenv("menu_choice", choice);call_saveenv = 1;}if (choice[0] == '+') {/* User wants u-boot prompt */s = getenv("menu_bootcmd");if (strcmp(s, MENU_PROMPT_BOOTCMD) != 0) {setenv("menu_bootcmd", MENU_PROMPT_BOOTCMD);saveenv();}return MENU_EXIT;}/* Steps to set the env variables to the chosen values */index = simple_strtoul(choice, NULL, 10);sprintf(menu_command, "/dev/sd%c%d", menu_bootlist[index].drive,menu_bootlist[index].partition);s = getenv("menu_root");if (strcmp(s, menu_command) != 0) {setenv("menu_root", menu_command);call_saveenv = 1;}s = getenv("menu_bootargs");if (strcmp(s, MENU_CHOSEN_BOOTARGS) != 0) {setenv("menu_bootargs", MENU_CHOSEN_BOOTARGS);call_saveenv = 1;}switch (menu_bootlist[index].fstype) {case 'e':strcpy(load_command, "ext4load");break;default:return MENU_EXIT;}/* Lets try to load and check the image */sprintf(menu_command, "%s %s %d:%d %x %s",load_command,menu_bootlist[index].interface,menu_bootlist[index].device,menu_bootlist[index].partition,CONFIG_SYS_LOAD_ADDR,menu_bootlist[index].filename);if (run_command(menu_command, 0) != 0) {/* Could not load image */printf("Selected image could not be loaded ...\n");return MENU_SHOW;}sprintf(menu_command, "iminfo %x", CONFIG_SYS_LOAD_ADDR);if (run_command(menu_command, 0) != 0) {/* The image is not a valid image */printf("Selected image is not valid ...\n");return MENU_SHOW;}sprintf(menu_command, "setenv bootcmd %s %s %d:%d %x %s",load_command,menu_bootlist[index].interface,menu_bootlist[index].device,menu_bootlist[index].partition,CONFIG_SYS_LOAD_ADDR,menu_bootlist[index].filename);s = getenv("menu_bootcmd");if (strcmp(s, menu_command) != 0) {setenv("menu_bootcmd", menu_command);call_saveenv = 1;}if (call_saveenv)saveenv();return MENU_EXIT;+}
+static int goflexhome_menu(struct menu_bootables menu_bootlist[], int
bootdelay)
+{ +int index; +struct menu *m; +char menu_key[MENU_MAX_BOOTABLES][5]; +char menu_entry[MENU_MAX_BOOTABLES][64]; +char *menu_choice; +char *last_menu_choice; +char choice_menu_entry[64]; +char choice_menu[3];
m = menu_create(MENU_OPTIONS_HEADER, 60, 1, goflexhome_menuprint,NULL, NULL);for (index = 0; index < MENU_MAX_BOOTABLES; index++) {if (menu_bootlist[index].fstype == '0')break;snprintf(menu_key[index], sizeof(menu_key[index]), "%d",index);
snprintf(menu_entry[index], sizeof(menu_entry[index]),"%d\t%s\t%c\t%d\t%d\t%c\t%s", index,menu_bootlist[index].interface,menu_bootlist[index].drive,menu_bootlist[index].device,menu_bootlist[index].partition,menu_bootlist[index].fstype,menu_bootlist[index].filename);if (menu_item_add(m, menu_key[index], menu_entry[index])!= 1) {
menu_destroy(m);return MENU_EXIT;}}/* Prep for what should be the default menu choice *//* If chosen before, choose the last boot options *//* If nothing chosen yet, then choose the first bootable option*/
/* If nothing chosen yet, and no first bootable option, thenboot */
/* from nand */last_menu_choice = getenv("menu_choice");sprintf(choice_menu, "*");if (last_menu_choice) {sprintf(choice_menu_entry, "* Last boot options (%s)",last_menu_choice);} else {/* There was no last boot option *//* If there is at least 1 boot entry, make that thedefault */
if (menu_bootlist[0].fstype != '0') {setenv("menu_choice", menu_entry[0]);sprintf(choice_menu_entry, menu_entry[0]);} else {sprintf(choice_menu_entry,MENU_DEFAULT_NOBOOTABLES);
}}if (menu_item_add(m, choice_menu, choice_menu_entry) != 1) {menu_destroy(m);return MENU_EXIT;}/* Mark this as the default choice. */menu_default_set(m, "*");if (menu_item_add(m, "+", "+ UBoot prompt") != 1) {menu_destroy(m);return MENU_EXIT;}menu_get_choice(m, (void **)&menu_choice);return goflexhome_handle_choice(menu_bootlist, menu_choice);+}
+static void goflexhome_filesearch(struct menu_bootables menu_bootlist[],
int *bootindex) {+char *filenames[] = { "/uImage", "/boot/uImage", "" }; +int index;
index = 0;while (filenames[index][0] != '\0') {switch (menu_bootlist[*bootindex].fstype) {case 'e':if (ext4fs_open(filenames[index]) == -1) {index++;continue;}break;default:break;}/* Got a hit, record it */strcpy(menu_bootlist[*bootindex].filename,filenames[index]);
index++;(*bootindex)++;if (*bootindex >= MENU_MAX_BOOTABLES)break;/* Prep next bootlist structure */memcpy(&menu_bootlist[*bootindex],&menu_bootlist[*bootindex - 1],sizeof(struct menu_bootables));}+}
+static void goflexhome_populate_partitions(struct menu_bootables
*menu_bootlist,
block_dev_desc_t *dev_desc,int *bootindex)+{ +int part; +disk_partition_t disk_part;
part = menu_bootlist[*bootindex].partition;/* Get the partition structure */if (get_partition_info(dev_desc, part, &disk_part))return;/* Try to check if its extX */if (ext4fs_probe(dev_desc, &disk_part) == 0) {menu_bootlist[*bootindex].fstype = 'e';goflexhome_filesearch(menu_bootlist, bootindex);ext4fs_close();return;}+}
+static void goflexhome_populate_devices(struct menu_bootables
menu_bootlist[],
int *bootindex)+{ +block_dev_desc_t *dev_desc; +int device; +int part;
/* Populate bootlist from each device and the partitions within*/
for (device = 0; device < MENU_MAX_DEVICES; device++) {dev_desc = get_dev(menu_bootlist[*bootindex].interface,device);
if (dev_desc == NULL)continue;menu_bootlist[*bootindex].device = device;for (part = 0; part < MENU_MAX_PARTITIONS; part++) {menu_bootlist[*bootindex].partition = part;goflexhome_populate_partitions(menu_bootlist,dev_desc,
bootindex);}}+}
+/* menu_bootlist[] can hold a max of MENU_MAX_BOOTABLES entries */ +static void goflexhome_populate_bootlist(struct menu_bootables
menu_bootlist[])
+{ +/* ide is always first */ +char *interfaces[] = { "ide", "usb", "" }; +int bootindex; +int i;
bootindex = 0;i = 0;/* Lets initialize the usb sub system */usb_init();usb_stor_scan(0);/* This scans the partitions in the IDE storage */ide_init();/* Populate bootlist from each interface */while ((interfaces[i][0] != '\0') &&(bootindex < MENU_MAX_BOOTABLES)) {strcpy(menu_bootlist[bootindex].interface,interfaces[i]);
goflexhome_populate_devices(menu_bootlist, &bootindex);i++;}if (bootindex < MENU_MAX_BOOTABLES) {/* End marker of list */menu_bootlist[bootindex].fstype = '0';}/* Lets set the drive letter */menu_bootlist[0].drive = 'a';for (i = 1; i < bootindex; i++) {if (menu_bootlist[i].fstype == '0')break;/* Increase drive letter when interface changes *//* Or when device numbers change for same interface */menu_bootlist[i].drive = menu_bootlist[i - 1].drive;if (strcmp(menu_bootlist[i].interface,menu_bootlist[i - 1].interface) != 0) {menu_bootlist[i].drive++;} else {if (menu_bootlist[i].device >menu_bootlist[i - 1].device) {menu_bootlist[i].drive++;}}}+}
+int menu_show(int bootdelay) +{ +struct menu_bootables menu_bootlist[MENU_MAX_BOOTABLES]; +int retval;
goflexhome_populate_bootlist(menu_bootlist);do {retval = goflexhome_menu(menu_bootlist, bootdelay);if (retval == MENU_EXIT)retval = goflexhome_evaluate_env();} while (retval == MENU_SHOW);return 0;+}
+#endif /* CONFIG_MENU */
1.7.1
U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
On 04/10/2013 06:43 PM, Rob Herring wrote:
On Wed, Apr 10, 2013 at 8:12 AM, Suriyan Ramasami suriyan.r@gmail.com wrote:
Initialize usb and ide. Scan through the usb for storage and boot capable partitions. Scan through the ide interface for boot capable partitions. Present such bootable options to the user to choose to boot from If the user does not choose any choose the default option the default option is the option chosen by the user the last time If no such default option exists, boot from the first possible bootable option.
This all sounds very generic but...
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com
Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhomemenu.c | 415 +++++++++++++++++++++++++++++
but this is not a generic location. This feature would interest me and probably Stephen as well.
I was thinking along these lines as well for the treo 680. Suriyan, perhaps we can collaborate, with the guidance of the maintainers here.
Mike
Sounds good to me.
I shall attempt a generic version and call it cmd_bootscan.c in the common directory.
- Suriyan
On Thu, Apr 11, 2013 at 6:02 AM, Mike Dunn mikedunn@newsguy.com wrote:
On 04/10/2013 06:43 PM, Rob Herring wrote:
On Wed, Apr 10, 2013 at 8:12 AM, Suriyan Ramasami suriyan.r@gmail.com
wrote:
Initialize usb and ide. Scan through the usb for storage and boot capable partitions. Scan through the ide interface for boot capable partitions. Present such bootable options to the user to choose to boot from If the user does not choose any choose the default option the default option is the option chosen by the user the last time If no such default option exists, boot from the first possible bootable option.
This all sounds very generic but...
Signed-off-by: Suriyan Ramasami suriyan.r@gmail.com
Changes in v2: - Coding style changes
board/Seagate/goflexhome/goflexhomemenu.c | 415
+++++++++++++++++++++++++++++
but this is not a generic location. This feature would interest me and probably Stephen as well.
I was thinking along these lines as well for the treo 680. Suriyan, perhaps we can collaborate, with the guidance of the maintainers here.
Mike
On Thu, Apr 11, 2013 at 12:51:03PM -0700, Suriyan Ramasami wrote:
Sounds good to me.
I shall attempt a generic version and call it cmd_bootscan.c in the common directory.
A good first pass. Please keep board/ait/cam_enc_4xx/cam_enc_4xx.c in mind as that has a similar set of things going on. Thanks!
Hi Suriyan,
On Wed, 10 Apr 2013 06:12:09 -0700, Suriyan Ramasami suriyan.r@gmail.com wrote:
Thank you Wolfgang and Prafulla for feedback on patch v1. This is version 2.
I couldn't figure out how to squash all these changes in one file with git. Do I just cat them? Hence, for this patch request they are unsquashed and in separate emails. Please let me know how I should squash for v3!
This adds support for the Seagate GoFlexHome. It is based on the dockstar files for the most part.
Suriyan Ramasami (8): Add maintainer for the Seagate GoFlexHome Add a board entry for the Seagate GoFlexHome Present the user with a menu of bootable options on boot
Please do not spread board additon over 7 patches of which 6 are necessarily useless if alone. Make this one single patch.
Also, patch 8 is unrelated to adding the board, and is not even related to any hardware. Make it a separate submission.
Amicalement,
Dear Suriyan Ramasami,
In message 1365599537-14138-1-git-send-email-suriyan.r@gmail.com you wrote:
I couldn't figure out how to squash all these changes in one file with git. Do I just cat them? Hence, for this patch request they are unsquashed and in separate emails. Please let me know how I should squash for v3!
Use: "git rebase -i master.." or "git rebase -i HEAD~8" or similar. Then, in your editor, make all commits except for the first one as "s" (squash).
If you google, you will find a lot or git documentation that explains the details; see for example http://gitready.com/advanced/2009/02/10/squashing-commits-with-rebase.html
Best regards,
Wolfgang Denk
participants (6)
-
Albert ARIBAUD -
Mike Dunn -
Rob Herring -
Suriyan Ramasami -
Tom Rini -
Wolfgang Denk