January 2018 - U-Boot

[U-Boot] [PATCH] nios2: 10m50: Add CPU pre-relocation in device tree
by Gan, Yau Wai 20 Sep '18

20 Sep '18

Tag CPU with dm-pre-reloc to enable driver before relocation. Signed-off-by: Gan, Yau Wai <yau.wai.gan(a)intel.com> Cc: Thomas Chou <thomas(a)wytron.com.tw> --- arch/nios2/dts/10m50_devboard.dts | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/nios2/dts/10m50_devboard.dts b/arch/nios2/dts/10m50_devboard.dts index 05eac30..461ae68 100644 --- a/arch/nios2/dts/10m50_devboard.dts +++ b/arch/nios2/dts/10m50_devboard.dts @@ -19,6 +19,7 @@ #size-cells = <0>; cpu: cpu@0 { + u-boot,dm-pre-reloc; device_type = "cpu"; compatible = "altr,nios2-1.1"; reg = <0x00000000>; -- 2.7.4

4 3

[U-Boot] [PATCH V5 00/31] imx: add i.MX8M support and i.MX8MQ EVK
by Peng Fan 07 Sep '18

07 Sep '18

This patchset is to add i.MX8M and i.MX8MQ-EVK support V5: Drop wait_mask_set/clr_timeout and switch to use readl_poll_timeout in the patchset. V4: Regenerate patchset based on Tom's master tree. In this patchset, https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom is included to avoid merge conflicts because the i.mx8m change also has some modification to bootaux and arch/arm/mach-imx/Makefile. Because CONFIG_GPT_TIMER change, I did a small modification to apply Tom's patch, no function change. Include ATF link in README. V3: This patchset based on https://patchwork.ozlabs.org/patch/855027/ "arm: imx: Rework i.MX specific commands to be excluded from SPL" from Tom to avoid this patchset fail apply after Tom's patch merged. Previously "power: pmic/regulator allow dm be omited by SPL" broke other boards, in V3 patchset, only touch pfuze100 related options. Sharing code about get mac from fuse between mx7/mx8m Sharing code about bootaux between mx6/7/mx8m Sharing code about cpu speed grade between mx7/mx8m Sharing code about get boot device between mx7/mx8m Sharding code about mmc env between mx7/mx8m Introduce wait_mask_set/clr_timeout to avoid deadloop in clock pll configuration Correct authorship of fix building warning on fec arm64, patch 27/31. Switch to use structure for DDR Controller. For DDR PHY registers, there are about more than 10 thousands registers, I could not convert them with detailed register name, and the script is generated from IC team, So I use regs[0xxxxx] arrays here fo easily converting between IC team released script and uboot ddr phy cod. Improve REAMME file to include where to download firmware and imx-mkimage and how to build Add review tags on the V2 patchset. Hope this patchset could catch up next release :) V2: patch 02/23: convert to structure, drop is_boot_from_usb and disconnect_from_usb patch 04/23: conver to use structure for the clock driver, removed the CCM_xxx macros. Add static for local functons. Add init_usdhc_clk, init_uart_clk and etc to not enable them all at default. patch 05/23: Add more commit msg for the sip part. patch 08/23: Merge the spl boot device with i.MX7 patch 12/23: Typo fix and return error fix from Heiko for the SoC related part patch 22/23: Use a weak function ddr_init. If patch 23/23 could not be accepted at current stage, to make others still be could be compiled. The patchset depends on https://patchwork.ozlabs.org/patch/841934/ https://patchwork.ozlabs.org/patch/841958/ to be tested on real hardware. V1: patch: "power: pmic.h: include dm/ofnode.h" and "power: pmic/regulator allow dm be omited by SPL" is previously reviewed in mailist to not merged. If no issue, you may pick it up. The board support is a large patch because of the ddr related code. If it is not good, please first review/pick-up other patches if they are ok. Peng Fan (29): imx: add i.MX8M into Kconfig imx: mx8m: add register definition header file imx: mx8m: add pin header file imx: mx8m: add clock driver imx: add sip function imx: boot_mode: add USB_BOOT entry imx: cpu: update cpu file to support i.MX8M imx: spl: implement spl_boot_device for i.MX8M imx: add i.MX8MQ SoC Revision and is_mx8m helper imx: add pad settings bit definition for i.MX8M imx: cpu: move speed/temp to common cpu imx: cpu: add cpu speed/grade for i.MX8M imx: refactor imx_get_mac_from_fuse imx: cleanup bootaux imx: bootaux: support i.MX8M imx: mx7: move get_boot_device to cpu.c imx: cpu: support get_boot_device for i.MX8M imx: mx7: move mmc env code to mmc_env.c imx: mx8m: add soc related settings and files imx: makefile: compile files for i.MX8M misc: ocotp: add i.MX8M support mmc: fsl_esdhc: support i.MX8M imx: lcdif: include i.MX8M gpio: mxc: add i.MX8M support net: fec: do not access reserved register for i.MX8M imx: imx8mq: add dtsi file power: pmic/regulator allow dm be omitted by SPL imx: mx8m: add ddr controller memory map imx: add i.MX8MQ EVK support Tom Rini (1): arm: imx: Rework i.MX specific commands to be excluded from SPL Ye Li (1): net: fec: fix build warnings for 64bits support arch/arm/Kconfig | 14 +- arch/arm/Makefile | 4 +- arch/arm/dts/Makefile | 2 + arch/arm/dts/fsl-imx8-ca53.dtsi | 92 ++ arch/arm/dts/fsl-imx8mq-evk.dts | 424 +++++++++ arch/arm/dts/fsl-imx8mq.dtsi | 429 +++++++++ arch/arm/include/asm/arch-imx/cpu.h | 6 +- arch/arm/include/asm/arch-mx6/imx-regs.h | 9 +- arch/arm/include/asm/arch-mx7/imx-regs.h | 18 +- arch/arm/include/asm/arch-mx8m/clock.h | 657 +++++++++++++ arch/arm/include/asm/arch-mx8m/crm_regs.h | 10 + arch/arm/include/asm/arch-mx8m/ddr.h | 365 ++++++++ arch/arm/include/asm/arch-mx8m/gpio.h | 12 + arch/arm/include/asm/arch-mx8m/imx-regs.h | 468 ++++++++++ arch/arm/include/asm/arch-mx8m/mx8mq_pins.h | 623 +++++++++++++ arch/arm/include/asm/arch-mx8m/sys_proto.h | 18 + arch/arm/include/asm/mach-imx/boot_mode.h | 10 + arch/arm/include/asm/mach-imx/iomux-v3.h | 22 +- arch/arm/include/asm/mach-imx/regs-lcdif.h | 10 +- arch/arm/include/asm/mach-imx/sys_proto.h | 4 + arch/arm/mach-imx/Makefile | 23 +- arch/arm/mach-imx/cpu.c | 130 ++- arch/arm/mach-imx/imx_bootaux.c | 51 +- arch/arm/mach-imx/mac.c | 61 ++ arch/arm/mach-imx/mmc_env.c | 30 + arch/arm/mach-imx/mx5/clock.c | 4 +- arch/arm/mach-imx/mx6/soc.c | 72 -- arch/arm/mach-imx/mx7/clock.c | 2 + arch/arm/mach-imx/mx7/soc.c | 195 ---- arch/arm/mach-imx/mx7ulp/clock.c | 2 + arch/arm/mach-imx/mx8m/Kconfig | 22 + arch/arm/mach-imx/mx8m/Makefile | 8 + arch/arm/mach-imx/mx8m/clock.c | 795 ++++++++++++++++ arch/arm/mach-imx/mx8m/clock_slice.c | 742 +++++++++++++++ arch/arm/mach-imx/mx8m/lowlevel_init.S | 63 ++ arch/arm/mach-imx/mx8m/soc.c | 227 +++++ arch/arm/mach-imx/sip.c | 23 + arch/arm/mach-imx/spl.c | 10 +- board/freescale/mx8mq_evk/Kconfig | 12 + board/freescale/mx8mq_evk/Makefile | 12 + board/freescale/mx8mq_evk/README | 47 + board/freescale/mx8mq_evk/ddr/ddr_init.c | 246 +++++ board/freescale/mx8mq_evk/ddr/ddrphy_train.c | 1272 ++++++++++++++++++++++++++ board/freescale/mx8mq_evk/ddr/helper.c | 101 ++ board/freescale/mx8mq_evk/mx8mq_evk.c | 156 ++++ board/freescale/mx8mq_evk/spl.c | 230 +++++ configs/mx8mq_evk_defconfig | 27 + drivers/gpio/mxc_gpio.c | 22 +- drivers/misc/mxc_ocotp.c | 7 + drivers/mmc/fsl_esdhc.c | 12 +- drivers/net/fec_mxc.c | 78 +- drivers/power/pmic/Makefile | 2 +- drivers/power/regulator/Makefile | 2 +- include/configs/mx8mq_evk.h | 269 ++++++ include/dt-bindings/clock/imx8mq-clock.h | 612 +++++++++++++ include/dt-bindings/pinctrl/pins-imx8mq.h | 632 +++++++++++++ include/imx_sip.h | 14 + 57 files changed, 9047 insertions(+), 363 deletions(-) create mode 100644 arch/arm/dts/fsl-imx8-ca53.dtsi create mode 100644 arch/arm/dts/fsl-imx8mq-evk.dts create mode 100644 arch/arm/dts/fsl-imx8mq.dtsi create mode 100644 arch/arm/include/asm/arch-mx8m/clock.h create mode 100644 arch/arm/include/asm/arch-mx8m/crm_regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/ddr.h create mode 100644 arch/arm/include/asm/arch-mx8m/gpio.h create mode 100644 arch/arm/include/asm/arch-mx8m/imx-regs.h create mode 100644 arch/arm/include/asm/arch-mx8m/mx8mq_pins.h create mode 100644 arch/arm/include/asm/arch-mx8m/sys_proto.h create mode 100644 arch/arm/mach-imx/mac.c create mode 100644 arch/arm/mach-imx/mmc_env.c create mode 100644 arch/arm/mach-imx/mx8m/Kconfig create mode 100644 arch/arm/mach-imx/mx8m/Makefile create mode 100644 arch/arm/mach-imx/mx8m/clock.c create mode 100644 arch/arm/mach-imx/mx8m/clock_slice.c create mode 100644 arch/arm/mach-imx/mx8m/lowlevel_init.S create mode 100644 arch/arm/mach-imx/mx8m/soc.c create mode 100644 arch/arm/mach-imx/sip.c create mode 100644 board/freescale/mx8mq_evk/Kconfig create mode 100644 board/freescale/mx8mq_evk/Makefile create mode 100644 board/freescale/mx8mq_evk/README create mode 100644 board/freescale/mx8mq_evk/ddr/ddr_init.c create mode 100644 board/freescale/mx8mq_evk/ddr/ddrphy_train.c create mode 100644 board/freescale/mx8mq_evk/ddr/helper.c create mode 100644 board/freescale/mx8mq_evk/mx8mq_evk.c create mode 100644 board/freescale/mx8mq_evk/spl.c create mode 100644 configs/mx8mq_evk_defconfig create mode 100644 include/configs/mx8mq_evk.h create mode 100644 include/dt-bindings/clock/imx8mq-clock.h create mode 100644 include/dt-bindings/pinctrl/pins-imx8mq.h create mode 100644 include/imx_sip.h -- 2.14.1

12 91

[U-Boot] [PATCH] x86: extend baudrate table with 57600
by Christian Gmeiner 06 Sep '18

06 Sep '18

Signed-off-by: Christian Gmeiner <christian.gmeiner(a)gmail.com> --- include/configs/x86-common.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index b5ef8b5..9a97714 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -56,7 +56,7 @@ * Serial Configuration */ #define CONFIG_SYS_BAUDRATE_TABLE {300, 600, 1200, 2400, 4800, \ - 9600, 19200, 38400, 115200} + 9600, 19200, 38400, 57600, 115200} #define CONFIG_SYS_NS16550_PORT_MAPPED #define CONFIG_CMDLINE_EDITING -- 2.9.4

3 8

[U-Boot] [PATCH v1 1/2] x86: zImage: Move subarch assignment out of cmd_line check
by Andy Shevchenko 22 Aug '18

22 Aug '18

The commit 20bfac0599bd ("x86: zImage: add Intel MID platforms support") introduced an assignment of subarch field in boot parameters, though missed the right place of doing that. It doesn't matter if we have or not a kernel command line supplied, we just set that field. Although guard it by protocol version which supports it. Fixes: 20bfac0599bd ("x86: zImage: add Intel MID platforms support") Cc: Vincent Tinelli <vincent.tinelli(a)intel.com> Signed-off-by: Andy Shevchenko <andriy.shevchenko(a)linux.intel.com> --- arch/x86/lib/zimage.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/arch/x86/lib/zimage.c b/arch/x86/lib/zimage.c index 00172dc7c1..d224db4e07 100644 --- a/arch/x86/lib/zimage.c +++ b/arch/x86/lib/zimage.c @@ -246,14 +246,15 @@ int setup_zimage(struct boot_params *setup_base, char *cmd_line, int auto_boot, hdr->setup_move_size = 0x9100; } -#if defined(CONFIG_INTEL_MID) - hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; -#endif - /* build command line at COMMAND_LINE_OFFSET */ build_command_line(cmd_line, auto_boot); } +#ifdef CONFIG_INTEL_MID + if (bootproto >= 0x0207) + hdr->hardware_subarch = X86_SUBARCH_INTEL_MID; +#endif + setup_video(&setup_base->screen_info); return 0; -- 2.15.1

2 14

[U-Boot] [PATCH v2 0/8] test/py: Fixes for python 3.x
by Paul Burton 21 Aug '18

21 Aug '18

This series allows test/py to run on python 3.x in addition to the already supported python 2.x. With it applied I currently see only one failure (test_ut[ut_dm_usb_flash]) which doesn't appear to be python related when running with: $ ./test/py/test.py --bd sandbox --build Thanks, Paul Paul Burton (8): test/py: Make print statements python 3.x safe test/py: Use range() rather than xrange() test/py: Import 'configparser' lower case to be python 3.x safe test/py: Import StringIO from io module for python 3.x test/py: Encode/decode strings for stdio test/py: fit: Open files as binary files test/py: hush_if_test: Use open() in place of file() test/py: vboot: Remove stderr redirect from openssl command test/py/conftest.py | 18 +++++++++++++----- test/py/multiplexed_log.py | 4 ++-- test/py/test.py | 6 ++++-- test/py/tests/test_fit.py | 14 ++++++++------ test/py/tests/test_hush_if_test.py | 2 +- test/py/tests/test_ut.py | 2 +- test/py/tests/test_vboot.py | 4 ++-- test/py/u_boot_console_sandbox.py | 4 ++-- test/py/u_boot_spawn.py | 12 ++++++------ test/py/u_boot_utils.py | 4 ++-- 10 files changed, 41 insertions(+), 29 deletions(-) -- 2.14.1

5 23

[U-Boot] [PATCH 0/8] efi_loader: Support loading from El Torito isos
by Alexander Graf 14 Aug '18

14 Aug '18

Some distributions still provide .iso files for installation media. To give us greatest flexibility, this patch set adds support for El Torito booting with EFI payloads. Please consider for 2016.05 still. Thanks, Alex Alexander Graf (8): iso: Make little endian and 64bit safe iso: Start with partition 1 iso: Allow 512 byte sector size efi_loader: Split drive add into function efi_loader: Add el torito support efi_loader: Pass file path to payload efi_loader: Increase path string to 32 characters distro: Enable iso partition code cmd/bootefi.c | 48 +++++++++++++--- cmd/fs.c | 3 +- disk/part_iso.c | 50 +++++++++++----- disk/part_iso.h | 40 ++++++------- include/config_distro_defaults.h | 1 + include/efi_api.h | 2 +- include/efi_loader.h | 5 +- lib/efi_loader/efi_disk.c | 121 +++++++++++++++++++++++++++------------ 8 files changed, 187 insertions(+), 83 deletions(-) -- 1.8.5.6

4 19

[U-Boot] [PATCH] FSL PCI: Configure PCIe reference ratio
by Joakim Tjernlund 13 Aug '18

13 Aug '18

Most FSL PCIe controllers expects 333 MHz PCI reference clock. This clock is derived from the CCB but in many cases the ref. clock is not 333 MHz and a divisor needs to be configured. This adds PEX_CCB_DIV #define which can be defined for each type of CPU/platform. Signed-off-by: Joakim Tjernlund <joakim.tjernlund(a)infinera.com> --- drivers/pci/fsl_pci_init.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/pci/fsl_pci_init.c b/drivers/pci/fsl_pci_init.c index 52792dcd59..4d00b3f26c 100644 --- a/drivers/pci/fsl_pci_init.c +++ b/drivers/pci/fsl_pci_init.c @@ -322,6 +322,12 @@ void fsl_pci_init(struct pci_controller *hose, struct fsl_pci_info *pci_info) pci_setup_indirect(hose, cfg_addr, cfg_data); +#ifdef PEX_CCB_DIV + /* Configure the PCIE controller core clock ratio */ + pci_hose_write_config_dword(hose, dev, 0x440, + ((gd->bus_clk / 1000000) * + (16 / PEX_CCB_DIV)) / 333); +#endif block_rev = in_be32(&pci->block_rev1); if (PEX_IP_BLK_REV_2_2 <= block_rev) { pi = &pci->pit[2]; /* 0xDC0 */ -- 2.13.5

4 20

[U-Boot] armv5 and OMAP3 Question
by Adam Ford 04 Aug '18

04 Aug '18

The readme file for OMAP indicates that we compile using armv5 to "to allow more compilers to work" We have our arch/arm/mach-omap2/omap3/lowlevel_init.S file also noting some special assembly insturctions becuse we use armv5. The barriers defined also indicate we're using CP15 instead of the separate barrier instructions for armv7 because we're using armv5 instead. I just wonder in this day and age when we're noting a GCC version and generating warnings based on the GCC warning, do we still need to compile as armv5 any more? It seems like "to allow more compilers to work" would not really apply any more we're trying to push newer versions of GCC. (please don't flame me, I am honestly curious). adam

2 9

[U-Boot] [PATCH] xyz-modem: Change getc timeout loop waiting
by Tomas Melin 02 Aug '18

02 Aug '18

This fixes the loop delay when using a hw watchdog. In case a watchdog is used that accesses CPU registers, the defined delay of 20us in a tight loop will cause a huge delay in the actual timeout seen. This is caused by the fact that udelay will inheritantly call WATCHDOG_RESET. Together with the omap wdt implementation, the seen timeout increases up to around 30s. This makes the loop very slow and causes long delays when using the modem. Instead, implement the 2 sec loop by using the timer interface to know when to break out of the timeout loop. Watchdog kicking is taken care of by getc(). Signed-off-by: Tomas Melin <tomas.melin(a)vaisala.com> --- common/xyzModem.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/common/xyzModem.c b/common/xyzModem.c index 5656aac..e0d87db 100644 --- a/common/xyzModem.c +++ b/common/xyzModem.c @@ -71,12 +71,12 @@ typedef int cyg_int32; static int CYGACC_COMM_IF_GETC_TIMEOUT (char chan, char *c) { -#define DELAY 20 - unsigned long counter = 0; - while (!tstc () && (counter < xyzModem_CHAR_TIMEOUT * 1000 / DELAY)) + + ulong now = get_timer(0); + while (!tstc ()) { - udelay (DELAY); - counter++; + if (get_timer(now) > xyzModem_CHAR_TIMEOUT) + break; } if (tstc ()) { -- 2.1.4

3 6

[U-Boot] [PATCH v2 00/26] mmc: Add support for HS200 and UHS modes
by Jean-Jacques Hiblot 24 Jul '18

24 Jul '18

This series brings support for HS200 and UHS modes to the mmc core. It has been tested with the hsmmc driver on several platforms (DRA7, AM57x, AM437x, beaglebone black, Atmel SAMA5D3 xplained). Some modifications are required in the host driver to take advantage of this (voltage switching, tuning). The changes to the host driver will be posted a another series as this one is already long enough. The series starts with a small refactoring of th sd/mmc startup. The first 5 commits are mostly moving code around with little or no functionnal change. Then the notion of "mode" is introduced. Until now, this information wasn't kept in struct mmc. Only the clock and a flag for ddr was kept. Later the mode information will be used to select the clock frequency, the ddr flag and the tuning procedure. It will be also be check against the host capabilities. Then comes the big refactoring job in: "mmc: refactor MMC startup to make it easier to support new modes" and "mmc: refactor SD startup to make it easier to support new modes" Since the number of modes is increasing, it makes sense to try them in a more organized way. those commits use a list of supported modes and iterate through them to find the best working one. It also allows to switch more easilly from one mode to another (switching from HS200 to DDR52 to access boot partitions for example) Then there are a couple of new callback added to: - send the initialization stream (74 clock cycles) - wait while the card is busy (used during UHS voltage switching). checking is done on dat0. - select the IO voltage Then Power cycle is added. Without power cycle, if a UHS card fails to enumerate in UHS mode, it can't fall back to high speed mode and card enumeration will fail. Also in case of a reset (as opposed to a power on), it ensures that the SDCard is in clean state before re-doing the initialization. And finally the last commits add the support for HS200 and UHS. With this in place and the required changes in the HSMMC host driver (including DMA), we observe significant improvements in the performances on a DRA72 evm: eMMC HS200: 124 MB/s eMMC DDR52: 78 MB/s sd SDR104: 71 MB/s sd SDR50: 44 MB/s cheers, Jean-Jacques changes since v1: Changes take in account all the comment made during the first round of review. But it also include a rework of the handling of the voltage supplies and 2 new helper functions that can be used by the host driver during tuning and dts parsing. Here is a detailed list: * rebase on u-boot/master. * add the description for the new functions/members * fix the typos found in the reviews * limit the new features to DM_MMC only * fix the new checkpatch warnings/errors (is it now more strict ?) * get the voltage regulators from dts (main and IO-lines) * remove the set_vdd callback and do the job in the mmc core * add a send_init_stream callback to perform the 74 clock cycle sequence after power up * do a full power cycle (if possible) before the initialization. This ensures that the sd/MMC is in valid knwon state. Also it allows to check if the power cycling works as expected. * disable the UHS modes is power cycling is not available/working. This ensures that we won't be stuck if the UHS initialization fails. * select the appropriate signal voltage when selecting a mode (MMC only) * add a helper function to parse the generic dt bindings * add a helper function to send the tuning command Jean-Jacques Hiblot (17): mmc: dm: get the IO-line and main voltage regulators from the dts mmc: split mmc_startup() mmc: move the MMC startup for version above v4.0 in a separate function mmc: make ext_csd part of struct mmc mmc: add a function to read and test the ext csd (mmc >= 4) mmc: introduce mmc modes mmc: Add a function to dump the mmc capabilities mmc: use mmc modes to select the correct bus speed cmd: mmc: display the mode name and current bus speed in the mmc info mmc: refactor SD startup to make it easier to support new modes mmc: refactor MMC startup to make it easier to support new modes mmc: Add a new callback function to perform the 74 clocks cycle sequence mmc: Add support for UHS modes mmc: disable UHS modes if Vcc cannot be switched on and off mmc: Change mode when switching to a boot partition mmc: use the right voltage level for MMC DDR and HS200 modes mmc: add a library function to send tuning command Kishon Vijay Abraham I (9): mmc: make mmc_set_ios() return status mmc: Enable signal voltage to be selected from mmc core mmc: add power cyle support in mmc core mmc: add a new mmc parameter to disable mmc clock mmc: disable the mmc clock during power off mmc: Add a execute_tuning() callback to the mmc operations. mmc: add HS200 support in MMC core mmc: Retry some MMC cmds on failure dm: mmc: Add a library function to parse generic dt binding cmd/mmc.c | 3 +- drivers/mmc/Kconfig | 23 + drivers/mmc/fsl_esdhc.c | 2 +- drivers/mmc/mmc-uclass.c | 87 +++ drivers/mmc/mmc.c | 1511 ++++++++++++++++++++++++++++++++++------------ include/mmc.h | 176 +++++- 6 files changed, 1417 insertions(+), 385 deletions(-) -- 1.9.1

7 49