November 2012 - U-Boot

[U-Boot] [PATCH 0/20] Final patch set for basic coreboot x86 implementation
by Simon Glass 04 Dec '12

04 Dec '12

This series contains patches to: - enable video and keyboard - fix up some x86 relocation bugs - Implement show_boot_progress() - Provide access to new Intel core architecture timers - Enable device tree control and add a basic fdt include file With the above changes (on top of previously-submitted series), we have a basically functioning U-Boot on x86, running from coreboot. Further work is required to tidy up MTRR support (based on Graeme's comments), add a SPI driver, rename the config file, move coreboot support into a lib directory (or similar), clean up the config to enable various other devices and a few other minor issues. This work will be the subject of a later series. Duncan Laurie (3): x86: Fix MTRR clear to detect which MTRR to use x86: Issue SMI to finalize Coreboot in final stage video: Check for valid FB pointer before clearing Gabe Black (8): x86: Initialise SPI if enabled x86: Reorder x86's post relocation memory layout x86: Make the upper bound on relocated symbols closed instead of open x86: Make calculate_relocation_address an overridable function x86: Override calculate_relocation_address to use the e820 map x86: Add back cold- and warm-boot flags x86: Add support for CONFIG_OF_CONTROL x86: coreboot: Set CONFIG_ARCH_DEVICE_TREE correctly Simon Glass (3): x86: fdt: Create basic .dtsi file for coreboot x86: Remove video_init() prototype from u-boot-x86.h x86: coreboot: Enable video display Stefan Reinauer (4): x86: Add CONFIG_DELAY_ENVIRONMENT to delay environment loading x86: Emit port 80 post codes in show_boot_progress() x86: Remove coreboot_ from file name x86: drop unused code in coreboot.c Vadim Bendebury (2): x86: Provide tick counter and frequency reference for Intel core architecture x86: Provide a way to throttle port80 accesses arch/x86/cpu/coreboot/Makefile | 3 +- arch/x86/cpu/coreboot/{coreboot_car.S => car.S} | 0 arch/x86/cpu/coreboot/config.mk | 23 ++++++++++ arch/x86/cpu/coreboot/coreboot.c | 53 ++++++++++++++++++----- arch/x86/cpu/coreboot/sdram.c | 53 +++++++++++++++++++++-- arch/x86/cpu/interrupts.c | 31 +++++++++++++ arch/x86/cpu/start.S | 10 ++++- arch/x86/cpu/start16.S | 3 + arch/x86/dts/coreboot.dtsi | 16 +++++++ arch/x86/dts/skeleton.dtsi | 13 ++++++ arch/x86/include/asm/global_data.h | 6 +++ arch/x86/include/asm/init_helpers.h | 1 + arch/x86/include/asm/u-boot-x86.h | 1 - arch/x86/lib/board.c | 10 ++++ arch/x86/lib/init_helpers.c | 50 +++++++++++++++++++--- arch/x86/lib/init_wrappers.c | 28 ++++++++++++- arch/x86/lib/relocate.c | 2 +- drivers/video/cfb_console.c | 5 +- include/configs/coreboot.h | 10 +++- 19 files changed, 287 insertions(+), 31 deletions(-) rename arch/x86/cpu/coreboot/{coreboot_car.S => car.S} (100%) create mode 100644 arch/x86/cpu/coreboot/config.mk create mode 100644 arch/x86/dts/coreboot.dtsi create mode 100644 arch/x86/dts/skeleton.dtsi -- 1.7.7.3

1 26

[U-Boot] Please pull u-boot-mpc85xx.git
by Andy Fleming 03 Dec '12

03 Dec '12

The following changes since commit 66dc452bfe13b0e276adddf3997b9c5abc00115d: Remove obsolete header file (2012-11-27 09:41:10 -0700) are available in the git repository at: git://www.denx.de/git/u-boot-mpc85xx.git master for you to fetch changes up to afbfdf545090472b734367ac2c874bfbe8928790: powerpc/mpc85xx: Fix a bug introduced by CONFIG_PPC_SPINTABLE_COMPATIBLE (2012-11-27 18:28:08 -0600) ---------------------------------------------------------------- Andy Fleming (1): 8xxx: Change all 8*xx_DDR addresses to 8xxx Kim Phillips (1): powerpc/mpc8xxx: take fdt_fixup_crypto_node() off the checkstack list Timur Tabi (5): powerpc/85xx/p5040: add CONFIG_SYS_PPC64, del CONFIG_SYS_FSL_ELBC_MULTIBIT_ECC powerpc/85xx: add support for the Freescale P5040DS Superhydra reference board powerpc/85xx: implement check for erratum A-004849 work-around powerpc/85xx: implement check for erratum A-004580 work-around powerpc/85xx: update the work-around for P4080 erratum SERDES-9 York Sun (5): powerpc/qoriq: Move FMAN microcode location powerpc/corenet_ds: Update DDR timing for single-rank DIMMs powerpc/P2041RDB: Fix Flash address LAW address powerpc/mpc85xx: Temporary fix for spin table backward compatibility powerpc/mpc85xx: Fix a bug introduced by CONFIG_PPC_SPINTABLE_COMPATIBLE Yuanquan Chen (1): powerpc/p4080ds: fix PCI-e x8 link training down failure Zang Roy-R61911 (1): powerpc/corenet_ds: move SATA config to board configuration arch/powerpc/cpu/mpc85xx/cmd_errata.c | 114 ++++ arch/powerpc/cpu/mpc85xx/cpu.c | 14 +- arch/powerpc/cpu/mpc85xx/cpu_init.c | 12 + arch/powerpc/cpu/mpc85xx/ddr-gen1.c | 4 +- arch/powerpc/cpu/mpc85xx/ddr-gen2.c | 9 +- arch/powerpc/cpu/mpc85xx/ddr-gen3.c | 14 +- arch/powerpc/cpu/mpc85xx/fsl_corenet_serdes.c | 20 +- arch/powerpc/cpu/mpc85xx/release.S | 35 +- arch/powerpc/cpu/mpc86xx/ddr-8641.c | 4 +- arch/powerpc/cpu/mpc8xxx/ddr/ctrl_regs.c | 10 +- arch/powerpc/cpu/mpc8xxx/ddr/util.c | 14 +- arch/powerpc/cpu/mpc8xxx/fdt.c | 6 +- arch/powerpc/include/asm/config_mpc85xx.h | 20 +- arch/powerpc/include/asm/immap_83xx.h | 6 +- arch/powerpc/include/asm/immap_85xx.h | 27 +- arch/powerpc/include/asm/immap_86xx.h | 8 +- board/exmeritus/hww1u1a/hww1u1a.c | 2 +- board/freescale/common/Makefile | 2 + board/freescale/common/ngpixis.h | 2 +- board/freescale/corenet_ds/Makefile | 2 + board/freescale/corenet_ds/corenet_ds.c | 22 +- board/freescale/corenet_ds/ddr.c | 4 +- board/freescale/corenet_ds/eth_superhydra.c | 722 +++++++++++++++++++++++++ board/freescale/corenet_ds/p5040ds_ddr.c | 18 + board/freescale/mpc8540ads/mpc8540ads.c | 2 +- board/freescale/mpc8560ads/mpc8560ads.c | 2 +- board/freescale/mpc8569mds/mpc8569mds.c | 2 +- board/freescale/p1023rds/p1023rds.c | 2 +- board/freescale/p1_p2_rdb_pc/spl_minimal.c | 2 +- board/freescale/p2020ds/p2020ds.c | 2 +- board/sbc8548/ddr.c | 2 +- board/socrates/sdram.c | 2 +- boards.cfg | 1 + drivers/net/fm/Makefile | 1 + drivers/net/fm/p5040.c | 113 ++++ drivers/pci/fsl_pci_init.c | 22 + include/configs/P1010RDB.h | 1 + include/configs/P1022DS.h | 1 + include/configs/P1023RDS.h | 2 +- include/configs/P2041RDB.h | 20 +- include/configs/P3041DS.h | 1 + include/configs/P5020DS.h | 1 + include/configs/P5040DS.h | 40 ++ include/configs/corenet_ds.h | 2 +- nand_spl/board/freescale/p1010rdb/nand_boot.c | 2 +- nand_spl/board/freescale/p1023rds/nand_boot.c | 2 +- 46 files changed, 1207 insertions(+), 109 deletions(-) create mode 100644 board/freescale/corenet_ds/eth_superhydra.c create mode 100644 board/freescale/corenet_ds/p5040ds_ddr.c create mode 100644 drivers/net/fm/p5040.c create mode 100644 include/configs/P5040DS.h

3 4

[U-Boot] Pull request: u-boot-sh/master
by Nobuhiro Iwamatsu 03 Dec '12

03 Dec '12

Hi Tom, Please pull u-boot-sh master branch. Best regards, Nobuhiro The following changes since commit b8715d8def240014da5614a4f940130ec06d9ebf: Merge branch 'master' of git://git.denx.de/u-boot-fdt (2012-11-29 06:41:56 -0700) are available in the git repository at: git://git.denx.de/u-boot-sh master for you to fetch changes up to 7c791b3f0a8e42f8012f782ef56ad6e88858e7c4: serial: serial_sh: bugfix: autoboot fails if serial console is not connected (2012-11-30 15:06:05 +0900) ---------------------------------------------------------------- Tetsuyuki Kobayashi (1): serial: serial_sh: bugfix: autoboot fails if serial console is not connected Yoshihiro Shimoda (1): sh: fix trigger_address_error() arch/sh/include/asm/system.h | 2 +- drivers/serial/serial_sh.c | 20 +++++++++++++------- 2 files changed, 14 insertions(+), 8 deletions(-) -- Nobuhiro Iwamatsu iwamatsu at {nigauri.org / debian.org} GPG ID: 40AD1FA6

2 1

[U-Boot] [PATCH v2] include/linux/byteorder: Always defines __fswab64, __swab64p and __swab64s
by Nobuhiro Iwamatsu 03 Dec '12

03 Dec '12

When __BYTEORDER_HAS_U64__ is not defined, we got warning following: ----- /tmp/include/linux/byteorder/little_endian.h: In function ‘__cpu_to_be64p’: /tmp/include/linux/byteorder/little_endian.h:71:2: warning: implicit declaration of function ‘__swab64p’ [-Wimplicit-function-declaration] ----- Usually, __arch__swab64* required for __fswab64, __swab64p and __swab64s is defined. Therefore, __BYTEORDER_HAS_U64__ is unnecessary. This removes __BYTEORDER_HAS_U64__. Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj(a)renesas.com> CC: Kim Phillips <kim.phillips(a)freescale.com> --- v2: Fix mail address. include/linux/byteorder/swab.h | 2 -- 1 file changed, 2 deletions(-) diff --git a/include/linux/byteorder/swab.h b/include/linux/byteorder/swab.h index bb4a046..4334fa7 100644 --- a/include/linux/byteorder/swab.h +++ b/include/linux/byteorder/swab.h @@ -122,7 +122,6 @@ static __inline__ void __swab32s(__u32 *addr) __arch__swab32s(addr); } -#ifdef __BYTEORDER_HAS_U64__ static __inline__ __attribute__((const)) __u64 __fswab64(__u64 x) { # ifdef __SWAB_64_THRU_32__ @@ -141,7 +140,6 @@ static __inline__ void __swab64s(__u64 *addr) { __arch__swab64s(addr); } -#endif /* __BYTEORDER_HAS_U64__ */ #if defined(__KERNEL__) #define swab16 __swab16 -- 1.7.10.4

3 3

Re: [U-Boot] U-Boot for MIPS AR7161
by Dmytro 03 Dec '12

03 Dec '12

> commands used in openocd through a telnet connection to 127.0.0.1 4444: > reset > halt > reset > mww 0xb8060008 3 > mww 0xb806000c 0x12c > halt > mww 0xb8050000 0x00090828 > mww 0xb8050000 0x00050828 > mww 0xb8050000 0x00040828 > mww 0xb8050008 2 > mww 0xb8050008 3 > halt > reset init > load_image 8Muboot_RAM_version.bin 0x80000000 > resume 0x80000000 First: You somehow use the initialization commands from ar724x CPU for ar71xx CPU. If you do not see the difference, you do not understand what you count. You already have a configuration file ar71xx.cfg <= it enough. The fact that a ar71xx nSRST (unlike ar724x, where nSRST replaced by RST). The difference is significant for a soft reset / restart the processor. I also do not see a response from the CPU when you transfer mode processor reset or halt, probably something you have not connected properly. Or launch openocd incorrectly (not set the program configuration file for CPU). Secondly: You'll probably need your own loader platform AP96 modified so that it removed all the prerequisites for restarting the processor at boot uboot. Also in the source of any processor is a function of LOWLEVEL_INIT, it is virtually repeated initialization ar71xx.cfg, so this function must be disabled or removed to the new RAM bootloader version, as if it will stay, we just reboot the processor at boot uboot via jtag. Considering your experience and knowledge, I suggest you just unsolder flash memory and an external programmer to flash it. But if all you have decided to go to the end, or you need a JTAG fundamentally, I can put a patch for RAM_uboot AR724x (AP99 platform), so you can make the example of his version of the loader for AR71xx (AP96 platform).

5 11

Re: [U-Boot] [PATCH 00/46] Enhance spear support
by Stefan Roese 03 Dec '12

03 Dec '12

On 11/09/2012 10:49 AM, Armando Visconti wrote: > Ciao Stefan, Vipin, > >>> >>> Vipin, would you "volunteer" to eventually become this SPEAr U-Boot >>> custodian? Or someone else? >>> >> >> Yes, I volunteer to be the SPEAr U-Boot custodian.. >> > > I think that no one else could to this custodian job > better than Vipin... > > Guaranteed! I'm all for it. Lets see what Albert has to say here. Albert, whats your opinion here? Would you also like to see an SPEAr custodian to offload your patch-queue a but? Or would you prefer to handle SPEAr related patches yourself in the future? Thanks, Stefan

5 11

[U-Boot] [PATCH 0/4] apf27: add support of armadeus apf27 v2
by Philippe Reynes 02 Dec '12

02 Dec '12

Difference between v1 and v2: - use spl instead of nand_spl - use gpio api - remove use of useless CONFIG_SYS - remove use of config.mk - remove dead code Philippe Reynes (4): apf27: add missing constant to mx27 apf27: add support for the armadeus APF27 board apf27: add spl support for the apf27 apf27: add FPGA support for the apf27 board MAINTAINERS | 5 + arch/arm/cpu/arm926ejs/mx27/asm-offsets.c | 34 ++ arch/arm/include/asm/arch-mx27/imx-regs.h | 11 +- arch/arm/include/asm/arch-mx27/mxc_nand.h | 83 +++++ board/armadeus/apf27/Makefile | 51 +++ board/armadeus/apf27/apf27.c | 424 ++++++++++++++++++++++ board/armadeus/apf27/apf27.h | 477 +++++++++++++++++++++++++ board/armadeus/apf27/fpga.c | 262 ++++++++++++++ board/armadeus/apf27/fpga.h | 39 ++ board/armadeus/apf27/start.S | 549 +++++++++++++++++++++++++++++ board/armadeus/apf27/u-boot-spl.lds | 87 +++++ boards.cfg | 1 + include/configs/apf27.h | 458 ++++++++++++++++++++++++ 13 files changed, 2480 insertions(+), 1 deletions(-) create mode 100644 arch/arm/include/asm/arch-mx27/mxc_nand.h create mode 100644 board/armadeus/apf27/Makefile create mode 100644 board/armadeus/apf27/apf27.c create mode 100644 board/armadeus/apf27/apf27.h create mode 100644 board/armadeus/apf27/fpga.c create mode 100644 board/armadeus/apf27/fpga.h create mode 100644 board/armadeus/apf27/start.S create mode 100644 board/armadeus/apf27/u-boot-spl.lds create mode 100644 include/configs/apf27.h -- 1.7.4.4

4 9

[U-Boot] [PATCH] cm-t35: add USB host support
by Nikita Kiryanov 02 Dec '12

02 Dec '12

Add support for USB host ports on cm-t3530 and cm-t3730. Signed-off-by: Nikita Kiryanov <nikita(a)compulab.co.il> Signed-off-by: Igor Grinberg <grinberg(a)compulab.co.il> --- board/cm_t35/cm_t35.c | 77 ++++++++++++++++++++++++++++++++++++++++++++++ include/configs/cm_t35.h | 8 ++++- 2 files changed, 84 insertions(+), 1 deletion(-) diff --git a/board/cm_t35/cm_t35.c b/board/cm_t35/cm_t35.c index 6c2e95b..8d8d420 100644 --- a/board/cm_t35/cm_t35.c +++ b/board/cm_t35/cm_t35.c @@ -32,6 +32,7 @@ #include <netdev.h> #include <net.h> #include <i2c.h> +#include <usb.h> #include <twl4030.h> #include <linux/compiler.h> @@ -41,6 +42,8 @@ #include <asm/arch/mmc_host_def.h> #include <asm/arch/sys_proto.h> #include <asm/mach-types.h> +#include <asm/ehci-omap.h> +#include <asm/gpio.h> #include "eeprom.h" @@ -260,6 +263,36 @@ static void cm_t3x_set_common_muxconf(void) MUX_VAL(CP(HSUSB0_DATA6), (IEN | PTD | DIS | M0)); /*HSUSB0_DATA6*/ MUX_VAL(CP(HSUSB0_DATA7), (IEN | PTD | DIS | M0)); /*HSUSB0_DATA7*/ + /* USB EHCI */ + MUX_VAL(CP(ETK_D0_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT0*/ + MUX_VAL(CP(ETK_D1_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT1*/ + MUX_VAL(CP(ETK_D2_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT2*/ + MUX_VAL(CP(ETK_D7_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT3*/ + MUX_VAL(CP(ETK_D4_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT4*/ + MUX_VAL(CP(ETK_D5_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT5*/ + MUX_VAL(CP(ETK_D6_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT6*/ + MUX_VAL(CP(ETK_D3_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DT7*/ + MUX_VAL(CP(ETK_D8_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_DIR*/ + MUX_VAL(CP(ETK_D9_ES2), (IEN | PTD | EN | M3)); /*HSUSB1_NXT*/ + MUX_VAL(CP(ETK_CTL_ES2), (IDIS | PTD | DIS | M3)); /*HSUSB1_CLK*/ + MUX_VAL(CP(ETK_CLK_ES2), (IDIS | PTU | DIS | M3)); /*HSUSB1_STP*/ + + MUX_VAL(CP(ETK_D14_ES2), (IEN | PTD | EN | M3)); /*HSUSB2_DT0*/ + MUX_VAL(CP(ETK_D15_ES2), (IEN | PTD | EN | M3)); /*HSUSB2_DT1*/ + MUX_VAL(CP(MCSPI1_CS3), (IEN | PTD | EN | M3)); /*HSUSB2_DT2*/ + MUX_VAL(CP(MCSPI2_CS1), (IEN | PTD | EN | M3)); /*HSUSB2_DT3*/ + MUX_VAL(CP(MCSPI2_SIMO), (IEN | PTD | EN | M3)); /*HSUSB2_DT4*/ + MUX_VAL(CP(MCSPI2_SOMI), (IEN | PTD | EN | M3)); /*HSUSB2_DT5*/ + MUX_VAL(CP(MCSPI2_CS0), (IEN | PTD | EN | M3)); /*HSUSB2_DT6*/ + MUX_VAL(CP(MCSPI2_CLK), (IEN | PTD | EN | M3)); /*HSUSB2_DT7*/ + MUX_VAL(CP(ETK_D12_ES2), (IEN | PTD | EN | M3)); /*HSUSB2_DIR*/ + MUX_VAL(CP(ETK_D13_ES2), (IEN | PTD | EN | M3)); /*HSUSB2_NXT*/ + MUX_VAL(CP(ETK_D10_ES2), (IDIS | PTD | DIS | M3)); /*HSUSB2_CLK*/ + MUX_VAL(CP(ETK_D11_ES2), (IDIS | PTU | DIS | M3)); /*HSUSB2_STP*/ + + /* SB_T35_USB_HUB_RESET_GPIO */ + MUX_VAL(CP(CAM_WEN), (IDIS | PTD | DIS | M4)); /*GPIO_167*/ + /* I2C1 */ MUX_VAL(CP(I2C1_SCL), (IEN | PTU | EN | M0)); /*I2C1_SCL*/ MUX_VAL(CP(I2C1_SDA), (IEN | PTU | EN | M0)); /*I2C1_SDA*/ @@ -461,3 +494,47 @@ void __weak get_board_serial(struct tag_serialnr *serialnr) serialnr->low = 0; serialnr->high = 0; }; + +#ifdef CONFIG_USB_EHCI_OMAP +struct omap_usbhs_board_data usbhs_bdata = { + .port_mode[0] = OMAP_EHCI_PORT_MODE_PHY, + .port_mode[1] = OMAP_EHCI_PORT_MODE_PHY, + .port_mode[2] = OMAP_USBHS_PORT_MODE_UNUSED, +}; + +#define SB_T35_USB_HUB_RESET_GPIO 167 +int ehci_hcd_init(void) +{ + u8 val; + + if (gpio_request(SB_T35_USB_HUB_RESET_GPIO, "SB-T35 usb hub reset")) { + printf("Error: can't obtain GPIO %d for SB-T35 usb hub reset", + SB_T35_USB_HUB_RESET_GPIO); + return -1; + } + + gpio_direction_output(SB_T35_USB_HUB_RESET_GPIO, 0); + udelay(10); + gpio_set_value(SB_T35_USB_HUB_RESET_GPIO, 1); + udelay(1000); + + twl4030_i2c_read_u8(TWL4030_CHIP_GPIO, &val, + TWL4030_BASEADD_GPIO + 0x03); + val |= 0xC0; + /* Set GPIO6 and GPIO7 of TPS65930 as output */ + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, val, + TWL4030_BASEADD_GPIO + 0x03); + /* Take both PHYs out of reset */ + twl4030_i2c_write_u8(TWL4030_CHIP_GPIO, 0xC0, + TWL4030_BASEADD_GPIO + 0x0C); + udelay(1); + + return omap_ehci_hcd_init(&usbhs_bdata); +} + +int ehci_hcd_stop(void) +{ + return omap_ehci_hcd_stop(); +} + +#endif /* CONFIG_USB_EHCI_OMAP */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index 46c556d..35e2280 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -114,9 +114,15 @@ #define CONFIG_DOS_PARTITION /* USB */ -#define CONFIG_MUSB_UDC #define CONFIG_USB_OMAP3 +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_OMAP +#define CONFIG_USB_ULPI +#define CONFIG_USB_ULPI_VIEWPORT_OMAP +#define CONFIG_USB_STORAGE +#define CONFIG_MUSB_UDC #define CONFIG_TWL4030_USB +#define CONFIG_CMD_USB /* USB device configuration */ #define CONFIG_USB_DEVICE -- 1.7.10.4

2 3

[U-Boot] [PATCH 0/15] x86: Add cache and memory functions
by Simon Glass 01 Dec '12

01 Dec '12

This series adds some basic support for >4GB memory (including clearing it for security reasons), basic dcache control and coreboot time stamps. Duncan Laurie (2): x86: Ignore memory >4GB when parsing Coreboot tables x86: Fix off-by-one error in do_elf_reloc_fixups() Gabe Black (4): x86: Fill in the dram info using the e820 map on coreboot/x86 x86: Increase the size of the phys_size_t and phys_addr_t types Introduce arch_phys_memset which works like memset but on physical memory x86: Implement arch_phys_memset so that it can wipe memory above 4GB Simon Glass (2): x86: Fix indirect jmp warning in zimage.c x86: Enable CONFIG_CMD_ZBOOT for coreboot Stefan Reinauer (4): x86: Add basic cache operations x86: Provide a function to clean up just before booting a zimage x86: Add functions to access MSRs x86: Clean up MTRR 7 right before jumping to the kernel Vadim Bendebury (3): x86: Add function to read time stamp counter x86: Enable coreboot timestamp facility support in u-boot. x86: Add a CBMEM timestamp generated right before the kernel startup. arch/x86/cpu/coreboot/Makefile | 1 + arch/x86/cpu/coreboot/coreboot.c | 22 +++ arch/x86/cpu/coreboot/sdram.c | 19 ++ arch/x86/cpu/coreboot/timestamp.c | 61 +++++++ arch/x86/cpu/interrupts.c | 8 +- arch/x86/include/asm/arch-coreboot/timestamp.h | 52 ++++++ arch/x86/include/asm/cache.h | 47 +++++ arch/x86/include/asm/io.h | 6 +- arch/x86/include/asm/msr.h | 25 +++ arch/x86/include/asm/types.h | 4 +- arch/x86/include/asm/u-boot-x86.h | 12 ++ arch/x86/lib/Makefile | 1 + arch/x86/lib/physmem.c | 228 ++++++++++++++++++++++++ arch/x86/lib/relocate.c | 2 +- arch/x86/lib/timer.c | 17 ++ arch/x86/lib/zimage.c | 24 ++- include/configs/coreboot.h | 2 + include/physmem.h | 21 +++ lib/physmem.c | 24 +++ 19 files changed, 560 insertions(+), 16 deletions(-) create mode 100644 arch/x86/cpu/coreboot/timestamp.c create mode 100644 arch/x86/include/asm/arch-coreboot/timestamp.h create mode 100644 arch/x86/include/asm/msr.h create mode 100644 arch/x86/lib/physmem.c create mode 100644 include/physmem.h create mode 100644 lib/physmem.c -- 1.7.7.3

3 24

[U-Boot] [PATCH 1/2] WIP: Changes to patman libraries
by Simon Glass 01 Dec '12

01 Dec '12

These changes are required to the patman libraries. This is not a proper patch yet, just sometime to try out. Signed-off-by: Simon Glass <sjg(a)chromium.org> --- tools/patman/checkpatch.py | 2 - tools/patman/command.py | 86 ++++++-- tools/patman/cros_subprocess.py | 402 +++++++++++++++++++++++++++++++++++++++ tools/patman/gitutil.py | 129 ++++++++++++- tools/patman/patchstream.py | 38 +++- tools/patman/terminal.py | 30 ++- 6 files changed, 642 insertions(+), 45 deletions(-) create mode 100644 tools/patman/cros_subprocess.py diff --git a/tools/patman/checkpatch.py b/tools/patman/checkpatch.py index d831087..4b6748a 100644 --- a/tools/patman/checkpatch.py +++ b/tools/patman/checkpatch.py @@ -70,8 +70,6 @@ def CheckPatch(fname, verbose=False): '~/bin directory') item = {} stdout = command.Output(chk, '--no-tree', fname) - #pipe = subprocess.Popen(cmd, stdout=subprocess.PIPE) - #stdout, stderr = pipe.communicate() # total: 0 errors, 0 warnings, 159 lines checked re_stats = re.compile('total: (\\d+) errors, (\d+) warnings, (\d+)') diff --git a/tools/patman/command.py b/tools/patman/command.py index 4b00250..a67ade3 100644 --- a/tools/patman/command.py +++ b/tools/patman/command.py @@ -20,53 +20,95 @@ # import os -import subprocess +import cros_subprocess """Shell command ease-ups for Python.""" -def RunPipe(pipeline, infile=None, outfile=None, - capture=False, oneline=False, hide_stderr=False): +class CommandResult: + """A class which captures the result of executing a command. + + Members: + stdout: stdout obtained from command, as a string + stderr: stderr obtained from command, as a string + return_code: Return code from command + exception: Exception received, or None if all ok + """ + def __init__(self): + self.stdout = None + self.stderr = None + self.return_code = None + self.exception = None + + +def RunPipe(pipe_list, infile=None, outfile=None, + capture=False, capture_stderr=False, oneline=False, + raise_on_error=True, cwd=None, **kwargs): """ Perform a command pipeline, with optional input/output filenames. - hide_stderr Don't allow output of stderr (default False) + Args: + pipe_list: List of command lines to execute. Each command line is + piped into the next, and is itself a list of strings. For + example [ ['ls', '.git'] ['wc'] ] will pipe the output of + 'ls .git' into 'wc'. + infile: File to provide stdin to the pipeline + outfile: File to store stdout + capture: True to capture output + capture_stderr: True to capture stderr + oneline: True to strip newline chars from output + kwargs: Additional keyword arguments to cros_subprocess.Popen() + Returns: + CommandResult object """ + result = CommandResult() last_pipe = None + pipeline = list(pipe_list) while pipeline: cmd = pipeline.pop(0) - kwargs = {} if last_pipe is not None: kwargs['stdin'] = last_pipe.stdout elif infile: kwargs['stdin'] = open(infile, 'rb') if pipeline or capture: - kwargs['stdout'] = subprocess.PIPE + kwargs['stdout'] = cros_subprocess.PIPE elif outfile: kwargs['stdout'] = open(outfile, 'wb') - if hide_stderr: - kwargs['stderr'] = open('/dev/null', 'wb') + if capture_stderr: + kwargs['stderr'] = cros_subprocess.PIPE - last_pipe = subprocess.Popen(cmd, **kwargs) + try: + last_pipe = cros_subprocess.Popen(cmd, cwd=cwd, **kwargs) + except Exception, err: + result.exception = err + print 'exception', pipe_list, err + raise Exception("Error running '%s': %s" % (pipe_list, str)) if capture: - ret = last_pipe.communicate()[0] - if not ret: - return None - elif oneline: - return ret.rstrip('\r\n') - else: - return ret + result.stdout, result.stderr, result.combined = ( + last_pipe.CommunicateFilter(None)) + if result.stdout and oneline: + result.output = result.stdout.rstrip('\r\n') + result.return_code = last_pipe.wait() else: - return os.waitpid(last_pipe.pid, 0)[1] == 0 + result.return_code = os.waitpid(last_pipe.pid, 0)[1] + if raise_on_error and result.return_code: + raise Exception("Error running '%s'" % pipe_list) + return result def Output(*cmd): - return RunPipe([cmd], capture=True) + return RunPipe([cmd], capture=True, raise_on_error=False).stdout -def OutputOneLine(*cmd): - return RunPipe([cmd], capture=True, oneline=True) +def OutputOneLine(*cmd, **kwargs): + raise_on_error = kwargs.pop('raise_on_error', True) + return (RunPipe([cmd], capture=True, oneline=True, + raise_on_error=raise_on_error, + **kwargs).stdout.strip()) def Run(*cmd, **kwargs): - return RunPipe([cmd], **kwargs) + return RunPipe([cmd], **kwargs).stdout def RunList(cmd): - return RunPipe([cmd], capture=True) + return RunPipe([cmd], capture=True).stdout + +def StopAll(): + cros_subprocess.stay_alive = False diff --git a/tools/patman/cros_subprocess.py b/tools/patman/cros_subprocess.py new file mode 100644 index 0000000..8b89387 --- /dev/null +++ b/tools/patman/cros_subprocess.py @@ -0,0 +1,402 @@ +#!/usr/bin/python + +# Copyright (c) 2011 The Chromium OS Authors. All rights reserved. +# Use of this source code is governed by a BSD-style license that can be +# found in the LICENSE file. +# +# Copyright (c) 2003-2005 by Peter Astrand <astrand(a)lysator.liu.se> +# Licensed to PSF under a Contributor Agreement. +# See http://www.python.org/2.4/license for licensing details. + +"""Subprocress execution + +This module holds a subclass of subprocess.Popen with our own required +features. +""" + +#TODO: Fix up indentation + +import errno +import os +import pty +import select +import subprocess +import sys +import unittest + + +# Import these here so the caller does not need to import subprocess also. +PIPE = subprocess.PIPE +STDOUT = subprocess.STDOUT +PIPE_PTY = -3 # Pipe output through a pty +stay_alive = True + + +class Popen(subprocess.Popen): + """Like subprocess.Popen with ptys and incremental output + + This class deals with running a child process and filtering its output on + both stdout and stderr while it is running. We do this so we can monitor + progress, and possibly relay the output to the user if requested. + + The class is similar to subprocess.Popen, the equivalent is something like: + + Popen(args, stdout=subprocess.PIPE, stderr=subprocess.PIPE) + + But this class has many fewer features, and two enhancement: + + 1. Rather than getting the output data only at the end, this class sends it + to a provided operation as it arrives. + 2. We use pseudo terminals so that the child will hopefully flush its output + to us as soon as it is produced, rather than waiting for the end of a + line. + + Use CommunicateFilter() to handle output from the subprocess. + + """ + + def __init__(self, args, stdin=None, stdout=PIPE_PTY, stderr=PIPE_PTY, + shell=False, cwd=None, env=None, **kwargs): + """Cut-down constructor + + Args: + args: Program and arguments for subprocess to execute. + stdin: See subprocess.Popen() + stdout: See subprocess.Popen(), except that we support the sentinel + value of cros_subprocess.PIPE_PTY. + stderr: See subprocess.Popen(), except that we support the sentinel + value of cros_subprocess.PIPE_PTY. + shell: See subprocess.Popen() + cwd: Working directory to change to for subprocess, or None if none. + env: Environment to use for this subprocess, or None to inherit parent. + kwargs: No other arguments are supported at the moment. Passing other + arguments will cause a ValueError to be raised. + """ + stdout_pty = None + stderr_pty = None + + if stdout == PIPE_PTY: + stdout_pty = pty.openpty() + stdout = os.fdopen(stdout_pty[1]) + if stderr == PIPE_PTY: + stderr_pty = pty.openpty() + stderr = os.fdopen(stderr_pty[1]) + + super(Popen, self).__init__(args, stdin=stdin, + stdout=stdout, stderr=stderr, shell=shell, cwd=cwd, env=env, + **kwargs) + + # If we're on a PTY, we passed the slave half of the PTY to the subprocess. + # We want to use the master half on our end from now on. Setting this here + # does make some assumptions about the implementation of subprocess, but + # those assumptions are pretty minor. + + # Note that if stderr is STDOUT, then self.stderr will be set to None by + # this constructor. + if stdout_pty is not None: + self.stdout = os.fdopen(stdout_pty[0]) + if stderr_pty is not None: + self.stderr = os.fdopen(stderr_pty[0]) + + # Insist that unit tests exist for other arguments we don't support. + if kwargs: + raise ValueError("Unit tests do not test extra args - please add tests") + + def CommunicateFilter(self, output): + """Interact with process: Read data from stdout and stderr. + + This method runs until end-of-file is reached, then waits for the + subprocess to terminate. + + The output function is sent all output from the subprocess and must be + defined like this: + + def Output([self,] stream, data) + Args: + stream: the stream the output was received on, which will be + sys.stdout or sys.stderr. + data: a string containing the data + + Note: The data read is buffered in memory, so do not use this + method if the data size is large or unlimited. + + Args: + output: Function to call with each fragment of output. + + Returns: + A tuple (stdout, stderr, combined) which is the data received on + stdout, stderr and the combined data (interleaved stdout and stderr). + + Note that the interleaved output will only be sensible if you have + set both stdout and stderr to PIPE or PIPE_PTY. Even then it depends on + the timing of the output in the subprocess. If a subprocess flips + between stdout and stderr quickly in succession, by the time we come to + read the output from each we may see several lines in each, and will read + all the stdout lines, then all the stderr lines. So the interleaving + may not be correct. In this case you might want to pass + stderr=cros_subprocess.STDOUT to the constructor. + + This feature is still useful for subprocesses where stderr is + rarely used and indicates an error. + + Note also that if you set stderr to STDOUT, then stderr will be empty + and the combined output will just be the same as stdout. + """ + + read_set = [] + write_set = [] + stdout = None # Return + stderr = None # Return + + if self.stdin: + # Flush stdio buffer. This might block, if the user has + # been writing to .stdin in an uncontrolled fashion. + self.stdin.flush() + if input: + write_set.append(self.stdin) + else: + self.stdin.close() + if self.stdout: + read_set.append(self.stdout) + stdout = [] + if self.stderr and self.stderr != self.stdout: + read_set.append(self.stderr) + stderr = [] + combined = [] + + input_offset = 0 + while read_set or write_set: + try: + rlist, wlist, _ = select.select(read_set, write_set, [], 0.2) + except select.error, e: + if e.args[0] == errno.EINTR: + continue + raise + + if not stay_alive: + self.terminate() + + if self.stdin in wlist: + # When select has indicated that the file is writable, + # we can write up to PIPE_BUF bytes without risk + # blocking. POSIX defines PIPE_BUF >= 512 + chunk = input[input_offset : input_offset + 512] + bytes_written = os.write(self.stdin.fileno(), chunk) + input_offset += bytes_written + if input_offset >= len(input): + self.stdin.close() + write_set.remove(self.stdin) + + if self.stdout in rlist: + data = "" + # We will get an error on read if the pty is closed + try: + data = os.read(self.stdout.fileno(), 1024) + except OSError: + pass + if data == "": + self.stdout.close() + read_set.remove(self.stdout) + else: + stdout.append(data) + combined.append(data) + if output: + output(sys.stdout, data) + if self.stderr in rlist: + data = "" + # We will get an error on read if the pty is closed + try: + data = os.read(self.stderr.fileno(), 1024) + except OSError: + pass + if data == "": + self.stderr.close() + read_set.remove(self.stderr) + else: + stderr.append(data) + combined.append(data) + if output: + output(sys.stderr, data) + + # All data exchanged. Translate lists into strings. + if stdout is not None: + stdout = ''.join(stdout) + else: + stdout = '' + if stderr is not None: + stderr = ''.join(stderr) + else: + stderr = '' + combined = ''.join(combined) + + # Translate newlines, if requested. We cannot let the file + # object do the translation: It is based on stdio, which is + # impossible to combine with select (unless forcing no + # buffering). + if self.universal_newlines and hasattr(file, 'newlines'): + if stdout: + stdout = self._translate_newlines(stdout) + if stderr: + stderr = self._translate_newlines(stderr) + + self.wait() + return (stdout, stderr, combined) + + +# Just being a unittest.TestCase gives us 14 public methods. Unless we +# disable this, we can only have 6 tests in a TestCase. That's not enough. +# +# pylint: disable=R0904 + +class TestSubprocess(unittest.TestCase): + """Our simple unit test for this module""" + + class MyOperation: + """Provides a operation that we can pass to Popen""" + def __init__(self, input_to_send=None): + """Constructor to set up the operation and possible input. + + Args: + input_to_send: a text string to send when we first get input. We will + add \r\n to the string. + """ + self.stdout_data = '' + self.stderr_data = '' + self.combined_data = '' + self.stdin_pipe = None + self._input_to_send = input_to_send + if input_to_send: + pipe = os.pipe() + self.stdin_read_pipe = pipe[0] + self._stdin_write_pipe = os.fdopen(pipe[1], 'w') + + def Output(self, stream, data): + """Output handler for Popen. Stores the data for later comparison""" + if stream == sys.stdout: + self.stdout_data += data + if stream == sys.stderr: + self.stderr_data += data + self.combined_data += data + + # Output the input string if we have one. + if self._input_to_send: + self._stdin_write_pipe.write(self._input_to_send + '\r\n') + self._stdin_write_pipe.flush() + + def _BasicCheck(self, plist, oper): + """Basic checks that the output looks sane.""" + self.assertEqual(plist[0], oper.stdout_data) + self.assertEqual(plist[1], oper.stderr_data) + self.assertEqual(plist[2], oper.combined_data) + + # The total length of stdout and stderr should equal the combined length + self.assertEqual(len(plist[0]) + len(plist[1]), len(plist[2])) + + def test_simple(self): + """Simple redirection: Get process list""" + oper = TestSubprocess.MyOperation() + plist = Popen(['ps']).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + + def test_stderr(self): + """Check stdout and stderr""" + oper = TestSubprocess.MyOperation() + cmd = 'echo fred >/dev/stderr && false || echo bad' + plist = Popen([cmd], shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], 'bad\r\n') + self.assertEqual(plist [1], 'fred\r\n') + + def test_shell(self): + """Check with and without shell works""" + oper = TestSubprocess.MyOperation() + cmd = 'echo test >/dev/stderr' + self.assertRaises(OSError, Popen, [cmd], shell=False) + plist = Popen([cmd], shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(len(plist [0]), 0) + self.assertEqual(plist [1], 'test\r\n') + + def test_list_args(self): + """Check with and without shell works using list arguments""" + oper = TestSubprocess.MyOperation() + cmd = ['echo', 'test', '>/dev/stderr'] + plist = Popen(cmd, shell=False).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], ' '.join(cmd[1:]) + '\r\n') + self.assertEqual(len(plist [1]), 0) + + oper = TestSubprocess.MyOperation() + + # this should be interpreted as 'echo' with the other args dropped + cmd = ['echo', 'test', '>/dev/stderr'] + plist = Popen(cmd, shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], '\r\n') + + def test_cwd(self): + """Check we can change directory""" + for shell in (False, True): + oper = TestSubprocess.MyOperation() + plist = Popen('pwd', shell=shell, cwd='/tmp').CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], '/tmp\r\n') + + def test_env(self): + """Check we can change environment""" + for add in (False, True): + oper = TestSubprocess.MyOperation() + env = os.environ + if add: + env ['FRED'] = 'fred' + cmd = 'echo $FRED' + plist = Popen(cmd, shell=True, env=env).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], add and 'fred\r\n' or '\r\n') + + def test_extra_args(self): + """Check we can't add extra arguments""" + self.assertRaises(ValueError, Popen, 'true', close_fds=False) + + def test_basic_input(self): + """Check that incremental input works + + We set up a subprocess which will prompt for name. When we see this prompt + we send the name as input to the process. It should then print the name + properly to stdout. + """ + oper = TestSubprocess.MyOperation('Flash') + prompt = 'What is your name?: ' + cmd = 'echo -n "%s"; read name; echo Hello $name' % prompt + plist = Popen([cmd], stdin=oper.stdin_read_pipe, + shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(len(plist [1]), 0) + self.assertEqual(plist [0], prompt + 'Hello Flash\r\r\n') + + #TODO(sjg): Add test for passing PIPE in case underlying subprocess breaks. + #TODO(sjg): Add test for passing a file handle also. + + def test_isatty(self): + """Check that ptys appear as terminals to the subprocess""" + oper = TestSubprocess.MyOperation() + cmd = ('if [ -t %d ]; then echo "terminal %d" >&%d; ' + 'else echo "not %d" >&%d; fi;') + both_cmds = '' + for fd in (1, 2): + both_cmds += cmd % (fd, fd, fd, fd, fd) + plist = Popen(both_cmds, shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], 'terminal 1\r\n') + self.assertEqual(plist [1], 'terminal 2\r\n') + + # Now try with PIPE and make sure it is not a terminal + oper = TestSubprocess.MyOperation() + plist = Popen(both_cmds, stdout=subprocess.PIPE, stderr=subprocess.PIPE, + shell=True).CommunicateFilter(oper.Output) + self._BasicCheck(plist, oper) + self.assertEqual(plist [0], 'not 1\n') + self.assertEqual(plist [1], 'not 2\n') + +if __name__ == '__main__': + unittest.main() diff --git a/tools/patman/gitutil.py b/tools/patman/gitutil.py index 72d37a0..5958439 100644 --- a/tools/patman/gitutil.py +++ b/tools/patman/gitutil.py @@ -23,11 +23,12 @@ import command import re import os import series -import settings import subprocess import sys import terminal +import settings + def CountCommitsToBranch(): """Returns number of commits between HEAD and the tracking branch. @@ -40,10 +41,123 @@ def CountCommitsToBranch(): """ pipe = [['git', 'log', '--no-color', '--oneline', '@{upstream}..'], ['wc', '-l']] - stdout = command.RunPipe(pipe, capture=True, oneline=True) + stdout = command.RunPipe(pipe, capture=True, oneline=True).stdout + patch_count = int(stdout) + return patch_count + +def GetUpstream(git_dir, branch): + """Returns the name of the upstream for a branch + + Args: + git_dir: Git directory containing repo + branch: Name of branch + + Returns: + Name of upstream branch (e.g. 'upstream/master') or None if none + """ + remote = command.OutputOneLine('git', '--git-dir', git_dir, 'config', + 'branch.%s.remote' % branch) + merge = command.OutputOneLine('git', '--git-dir', git_dir, 'config', + 'branch.%s.merge' % branch) + if remote == '.': + return merge + elif remote and merge: + leaf = merge.split('/')[-1] + return '%s/%s' % (remote, leaf) + else: + raise ValueError, ("Cannot determine upstream branch for branch " + "'%s' remote='%s', merge='%s'" % (branch, remote, merge)) + + +def GetRangeInBranch(git_dir, branch, include_upstream=False): + """Returns an expression for the commits in the given branch. + + Args: + git_dir: Directory containing git repo + branch: Name of branch + Return: + Expression in the form 'upstream..branch' which can be used to + access the commits. + """ + upstream = GetUpstream(git_dir, branch) + return '%s%s..%s' % (upstream, '~' if include_upstream else '', branch) + +def CountCommitsInBranch(git_dir, branch, include_upstream=False): + """Returns the number of commits in the given branch. + + Args: + git_dir: Directory containing git repo + branch: Name of branch + Return: + Number of patches that exist on top of the branch + """ + range_expr = GetRangeInBranch(git_dir, branch, include_upstream) + pipe = [['git', '--git-dir', git_dir, 'log', '--oneline', range_expr], + ['wc', '-l']] + result = command.RunPipe(pipe, capture=True, oneline=True) + patch_count = int(result.stdout) + return patch_count + +def CountCommits(commit_range): + """Returns the number of commits in the given range. + + Args: + commit_range: Range of commits to count (e.g. 'HEAD..base') + Return: + Number of patches that exist on top of the branch + """ + pipe = [['git', 'log', '--oneline', commit_range], + ['wc', '-l']] + stdout = command.RunPipe(pipe, capture=True, oneline=True).stdout patch_count = int(stdout) return patch_count +def Checkout(commit_hash, git_dir=None, work_tree=None, force=False): + """Checkout the selected commit for this build + + Args: + commit_hash: Commit hash to check out + """ + pipe = ['git'] + if git_dir: + pipe.extend(['--git-dir', git_dir]) + if work_tree: + pipe.extend(['--work-tree', work_tree]) + pipe.append('checkout') + if force: + pipe.append('-f') + pipe.append(commit_hash) + result = command.RunPipe([pipe], capture=True, raise_on_error=False) + if result.return_code != 0: + raise OSError, 'git checkout (%s): %s' % (pipe, result.stderr) + +def Clone(git_dir, output_dir): + """Checkout the selected commit for this build + + Args: + commit_hash: Commit hash to check out + """ + pipe = ['git', 'clone', git_dir, '.'] + result = command.RunPipe([pipe], capture=True, cwd=output_dir) + if result.return_code != 0: + raise OSError, 'git clone: %s' % result.stderr + +def Fetch(git_dir=None, work_tree=None): + """Fetch from the origin repo + + Args: + commit_hash: Commit hash to check out + """ + pipe = ['git'] + if git_dir: + pipe.extend(['--git-dir', git_dir]) + if work_tree: + pipe.extend(['--work-tree', work_tree]) + pipe.append('fetch') + result = command.RunPipe([pipe], capture=True) + if result.return_code != 0: + raise OSError, 'git fetch: %s' % result.stderr + def CreatePatches(start, count, series): """Create a series of patches from the top of the current branch. @@ -352,7 +466,8 @@ def GetAliasFile(): Returns: Filename of git alias file, or None if none """ - fname = command.OutputOneLine('git', 'config', 'sendemail.aliasesfile') + fname = command.OutputOneLine('git', 'config', 'sendemail.aliasesfile', + raise_on_error=False) if fname: fname = os.path.join(GetTopLevel(), fname.strip()) return fname @@ -384,6 +499,14 @@ def Setup(): if alias_fname: settings.ReadGitAliases(alias_fname) +def GetHead(): + """Get the hash of the current HEAD + + Returns: + Hash of HEAD + """ + return command.OutputOneLine('git', 'show', '-s', '--pretty=format:%H') + if __name__ == "__main__": import doctest diff --git a/tools/patman/patchstream.py b/tools/patman/patchstream.py index ad280cc..db2cc6c 100644 --- a/tools/patman/patchstream.py +++ b/tools/patman/patchstream.py @@ -237,7 +237,8 @@ class PatchStream: # Detect the start of a new commit elif commit_match: self.CloseCommit() - self.commit = commit.Commit(commit_match.group(1)[:7]) + # TODO: We should store the whole hash, and just display a subset + self.commit = commit.Commit(commit_match.group(1)[:8]) # Detect tags in the commit message elif tag_match: @@ -334,26 +335,47 @@ class PatchStream: self.Finalize() -def GetMetaData(start, count): +def GetMetaDataForList(commit_range, git_dir=None, count=None, + series = Series()): """Reads out patch series metadata from the commits This does a 'git log' on the relevant commits and pulls out the tags we are interested in. Args: - start: Commit to start from: 0=HEAD, 1=next one, etc. - count: Number of commits to list + commit_range: Range of commits to count (e.g. 'HEAD..base') + git_dir: Path to git repositiory (None to use default) + count: Number of commits to list, or None for no limit + series: Series object to add information into. By default a new series + is started. + Returns: + A Series object containing information about the commits. """ - pipe = [['git', 'log', '--no-color', '--reverse', 'HEAD~%d' % start, - '-n%d' % count]] - stdout = command.RunPipe(pipe, capture=True) - series = Series() + params = ['git', 'log', '--no-color', '--reverse', commit_range] + if count is not None: + params[2:2] = ['-n%d' % count] + if git_dir: + params[1:1] = ['--git-dir', git_dir] + pipe = [params] + stdout = command.RunPipe(pipe, capture=True).stdout ps = PatchStream(series, is_log=True) for line in stdout.splitlines(): ps.ProcessLine(line) ps.Finalize() return series +def GetMetaData(start, count): + """Reads out patch series metadata from the commits + + This does a 'git log' on the relevant commits and pulls out the tags we + are interested in. + + Args: + start: Commit to start from: 0=HEAD, 1=next one, etc. + count: Number of commits to list + """ + return GetMetaDataForList('HEAD~%d' % start, None, count) + def FixPatch(backup_dir, fname, series, commit): """Fix up a patch file, by adding/removing as required. diff --git a/tools/patman/terminal.py b/tools/patman/terminal.py index 838c828..337a2a4 100644 --- a/tools/patman/terminal.py +++ b/tools/patman/terminal.py @@ -24,24 +24,32 @@ This module handles terminal interaction including ANSI color codes. """ +import os +import sys + +# Selection of when we want our output to be colored +COLOR_IF_TERMINAL, COLOR_ALWAYS, COLOR_NEVER = range(3) + class Color(object): """Conditionally wraps text in ANSI color escape sequences.""" BLACK, RED, GREEN, YELLOW, BLUE, MAGENTA, CYAN, WHITE = range(8) BOLD = -1 - COLOR_START = '\033[1;%dm' + BRIGHT_START = '\033[1;%dm' + NORMAL_START = '\033[22;%dm' BOLD_START = '\033[1m' RESET = '\033[0m' - def __init__(self, enabled=True): + def __init__(self, colored=COLOR_IF_TERMINAL): """Create a new Color object, optionally disabling color output. Args: enabled: True if color output should be enabled. If False then this class will not add color codes at all. """ - self._enabled = enabled + self._enabled = (colored == COLOR_ALWAYS or + (colored == COLOR_IF_TERMINAL and os.isatty(sys.stdout.fileno()))) - def Start(self, color): + def Start(self, color, bright=True): """Returns a start color code. Args: @@ -52,7 +60,8 @@ class Color(object): otherwise returns empty string """ if self._enabled: - return self.COLOR_START % (color + 30) + base = self.BRIGHT_START if bright else self.NORMAL_START + return base % (color + 30) return '' def Stop(self): @@ -63,10 +72,10 @@ class Color(object): returns empty string """ if self._enabled: - return self.RESET + return self.RESET return '' - def Color(self, color, text): + def Color(self, color, text, bright=True): """Returns text with conditionally added color escape sequences. Keyword arguments: @@ -78,9 +87,10 @@ class Color(object): returns text with color escape sequences based on the value of color. """ if not self._enabled: - return text + return text if color == self.BOLD: - start = self.BOLD_START + start = self.BOLD_START else: - start = self.COLOR_START % (color + 30) + base = self.BRIGHT_START if bright else self.NORMAL_START + start = base % (color + 30) return start + text + self.RESET -- 1.7.7.3

4 16