Eric Lee / smarc-uboot

08 Sep, 2017

2 commits

26 Jul, 2017

1 commit

  • 2be296538   Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig ... Browse Code »
    20

    This converts the following to Kconfig:
    CONFIG_ENV_IS_IN_MMC
    CONFIG_ENV_IS_IN_NAND
    CONFIG_ENV_IS_IN_UBI
    CONFIG_ENV_IS_NOWHERE

    In fact this already exists for sunxi as a 'choice' config. However not
    all the choices are available in Kconfig yet so we cannot use that. It
    would lead to more than one option being set.

    In addition, one purpose of this series is to allow the environment to be
    stored in more than one place. So the existing choice is converted to a
    normal config allowing each option to be set independently.

    There are not many opportunities for Kconfig updates to reduce the size of
    this patch. This was tested with

    ./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC

    And then manual updates. This is because for CHAIN_OF_TRUST boards they
    can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
    now.

    Signed-off-by: Simon Glass
    Signed-off-by: Tom Rini

    Simon Glass
     

16 May, 2017

1 commit

15 May, 2017

1 commit

01 May, 2017

1 commit

31 Jan, 2017

1 commit

  • 54925327f   mmc: move CONFIG_GENERIC_MMC to Kconfig ... Browse Code »
    40

    Now, CONFIG_GENERIC_MMC seems equivalent to CONFIG_MMC.

    Let's create an entry for "config GENERIC_MMC" with "default MMC",
    then convert all macro defines in headers to Kconfig. Almost all
    of the defines will go away.

    I see only two exceptions:
    configs/blanche_defconfig
    configs/sandbox_noblk_defconfig

    They define CONFIG_GENERIC_MMC, but not CONFIG_MMC. Something
    might be wrong with these two boards, so should be checked later.

    Anyway, this is the output of the moveconfig tool.

    This commit was created as follows:

    [1] create a config entry in drivers/mmc/Kconfig

    [2] tools/moveconfig.py -r HEAD GENERIC_MMC

    [3] manual clean-up of garbage comments in doc/README.* and
    include/configs/*.h

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Tom Rini

    Masahiro Yamada
     

11 Jan, 2017

1 commit

  • 1d2c0506d   mmc: move more driver config options to Kconfig ... Browse Code »

    Move (and rename) the following CONFIG options to Kconfig:

    CONFIG_DAVINCI_MMC (renamed to CONFIG_MMC_DAVINCI)
    CONFIG_OMAP_HSMMC (renamed to CONFIG_MMC_OMAP_HS)
    CONFIG_MXC_MMC (renamed to CONFIG_MMC_MXC)
    CONFIG_MXS_MMC (renamed to CONFIG_MMC_MXS)
    CONFIG_TEGRA_MMC (renamed to CONFIG_MMC_SDHCI_TEGRA)
    CONFIG_SUNXI_MMC (renamed to CONFIG_MMC_SUNXI)

    They are the same option names as used in Linux.

    This commit was created as follows:

    [1] Rename the options with the following command:

    find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \
    -type f -print | xargs sed -i -e '
    s/CONFIG_DAVINCI_MMC/CONFIG_MMC_DAVINCI/g
    s/CONFIG_OMAP_HSMMC/CONFIG_MMC_OMAP_HS/g
    s/CONFIG_MXC_MMC/CONFIG_MMC_MXC/g
    s/CONFIG_MXS_MMC/CONFIG_MMC_MXS/g
    s/CONFIG_TEGRA_MMC/CONFIG_MMC_SDHCI_TEGRA/g
    s/CONFIG_SUNXI_MMC/CONFIG_MMC_SUNXI/g
    '

    [2] Commit the changes

    [3] Create entries in driver/mmc/Kconfig.
    (copied from Linux)

    [4] Move the options with the following command
    tools/moveconfig.py -y -r HEAD \
    MMC_DAVINCI MMC_OMAP_HS MMC_MXC MMC_MXS MMC_SDHCI_TEGRA MMC_SUNXI

    [5] Sort and align drivers/mmc/Makefile for readability

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Marek Vasut

    Masahiro Yamada
     

30 Dec, 2016

1 commit

  • c27269953   mmc: complete unfinished move of CONFIG_MMC ... Browse Code »
    26

    Commit 7a777f6d6f35 ("mmc: Add generic Kconfig option") created
    a Kconfig entry for this option without any actual moves, then
    commit 44c798799f66 ("sunxi: Use Kconfig CONFIG_MMC") moved
    instances only for SUNXI.

    We generally do not like such partial moves. This kind of work
    is automated by tools/moveconfig.py, so it is pretty easy to
    complete this move.

    I am adding "default ARM || PPC || SANDBOX" (suggested by Tom).
    This shortens the configs and will ease new board porting.

    This commit was created as follows:

    [1] Edit Kconfig (remove the "depends on", add the "default",
    copy the prompt and help message from Linux)

    [2] Run 'tools/moveconfig.py -y -s -r HEAD MMC'

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Jaehoon Chung

    Masahiro Yamada
     

24 Oct, 2016

1 commit

10 Sep, 2016

1 commit

26 Apr, 2016

2 commits

17 Feb, 2016

3 commits

19 Jan, 2016

1 commit

  • 5b8031ccb   Add more SPDX-License-Identifier tags ... Browse Code »
    40

    In a number of places we had wordings of the GPL (or LGPL in a few
    cases) license text that were split in such a way that it wasn't caught
    previously. Convert all of these to the correct SPDX-License-Identifier
    tag.

    Signed-off-by: Tom Rini

    Tom Rini
     

13 Aug, 2015

1 commit

  • 181bd9dc6   kconfig: add config option for shell prompt ... Browse Code »
    102

    Add option to set shell prompt string from menuconfig and migrate
    boards globally.

    The migration is done as follows:
    - Boards that explicitly and unconditionally set CONFIG_SYS_PROMPT had the
    entry moved to their defconfig files.
    - Boards that defined some kind of #ifdef logic which selects the
    CONFIG_SYS_PROMPT (for example qemu-mips) got an #undef CONFIG_SYS_PROMPT
    right before the #ifdef logic and were left alone.
    - This change forces CONFIG_SYS_PROMPT to be a per board decision, and thus
    CONFIG_SYS_PROMPT was removed from all _common.h and _common.h
    files. This results in a streamlined default value across platforms, and
    includes the following files: spear-common, sunxi-common, mv-common,
    ti_armv7_common, tegra-common, at91-sama5_common, and zynq-common.
    - Boards that relied on _common.h values of CONFIG_SYS_PROMPT were
    not updated in their respective defconfig files under the assumption that
    since they did not explicitly define a value, they're fine with whatever
    the default is.
    - On the other hand, boards that relied on a value defined in some
    _common.h file such as woodburn_common, rpi-common,
    bur_am335x_common, ls2085a_common, siemens_am33x_common, and
    omap3_evm_common, had their values moved to the respective defconfig files.
    - The define V_PROMPT was removed, since it is not used anywhere except for
    assigning a value for CONFIG_SYS_PROMPT.

    Cc: Tom Rini
    Cc: Masahiro Yamada
    Cc: Stefano Babic
    Cc: Igor Grinberg
    Signed-off-by: Nikita Kiryanov
    [trini: Add spring, sniper, smartweb to conversion]
    Signed-off-by: Tom Rini

    Nikita Kiryanov
     

01 Jun, 2015

1 commit

05 Mar, 2015

1 commit

  • 026baff75   ARM: tegra: move common config defines centrally ... Browse Code »

    All boards need CONFIG_BOARD_EARLY_INIT_F, and many actively need
    CONFIG_BOARD_LATE_INIT. Move both of these into tegra-common.h so that
    board config headers don't need to repeatedly define them.

    Later commits will add new code in board_late_init() which applies to
    all boards, so CONFIG_BOARD_LATE_INIT should be enabled for all Tegra
    boards.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     

25 Sep, 2014

2 commits

  • f1ef2b623   kconfig: move CONFIG_DEFAULT_DEVICE_TREE to kconfig ... Browse Code »
    86

    This option specifies the default Device Tree used for the run-time
    configuration of U-Boot.

    Signed-off-by: Masahiro Yamada
    Cc: Simon Glass
    Cc: Stephen Warren
    Cc: Minkyu Kang
    Cc: Michal Simek

    Masahiro Yamada
     
  • 783e6a72b   kconfig: move CONFIG_OF_* to Kconfig ... Browse Code »
    43

    This commit moves:
    CONFIG_OF_CONTROL
    CONFIG_OF_SEPARATE
    CONFIG_OF_EMBED
    CONFIG_OF_HOSTFILE

    Because these options are currently not supported for SPL,
    the "Device Tree Control" menu does not appear in the SPL
    configuration.

    Note:
    zynq-common.h should be adjusted so as not to change the
    default value of CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME.

    Signed-off-by: Masahiro Yamada
    Acked-by: Simon Glass
    Cc: Stephen Warren
    Cc: Minkyu Kang
    Acked-by: Michal Simek

    Masahiro Yamada
     

05 Mar, 2014

1 commit

  • 1ace40223   sizes.h - consolidate for all architectures ... Browse Code »

    Copied from Linux sources "include/linux/sizes.h" commit
    413541dd66d51f791a0b169d9b9014e4f56be13c

    Signed-off-by: Alexey Brodkin

    Cc: Vineet Gupta
    Cc: Tom Rini
    Cc: Stefan Roese
    Cc: Albert Aribaud
    Acked-by: Tom Rini
    Acked-by: Stefan Roese
    [trini: Add bcm Kona platforms to the patch]
    Signed-off-by: Tom Rini

    Alexey Brodkin
     

14 Jun, 2013

1 commit

  • 91171091c   ARM: tegra: make use of negative ENV_OFFSET on NVIDIA boards ... Browse Code »

    Use a negative value of CONFIG_ENV_OFFSET for all NVIDIA reference boards
    that store the U-Boot environment in the 2nd eMMC boot partition. This
    makes U-Boot agnostic to the size of the eMMC boot partition, which can
    vary depending on which eMMC device was actually stuffed into the board.

    Signed-off-by: Stephen Warren
    Acked-by: Tom Warren
    Signed-off-by: Andy Fleming

    Stephen Warren
     

15 Mar, 2013

1 commit

  • 11d9c0303   ARM: tegra: enable a common set of disk-related commands everywhere ... Browse Code »

    Enable a common set of partition types, filesystems, and related
    commands in tegra-common.h, so that they are available on all Tegra
    boards. This allows boot.scr (loaded and executed by the default
    built-in environment) on those boards to assume that certain features
    are always available.

    Do this in tegra-common.h, so that individual board files can undefine
    the features if they really don't want any of them.

    Signed-off-by: Stephen Warren
    Acked-by: Simon Glass
    Signed-off-by: Tom Warren

    Stephen Warren
     

17 Jan, 2013

2 commits

19 Nov, 2012

1 commit

  • 3786a942b   tegra: use generic fs commands in BOOTCOMMAND ... Browse Code »

    Modify tegra-common-post.h's BOOTCOMMAND definition to use the generic
    filesystem command load rather than separate fatload and ext2load.
    This removes the need to iterate over supported filesystem types in the
    boot command.

    This requires editing all board config headers to enable the new
    commands. The now-unused commands are left enabled to assue backwards
    compatibility with any user scripts. Boards (all from Avionic Design)
    which define custom BOOTCOMMAND values are not affected.

    Signed-off-by: Stephen Warren
    tegra generic fs cmds fixup
    Signed-off-by: Tom Warren

    Stephen Warren
     

16 Oct, 2012

1 commit

  • bffe31c14   serial: Remove CONFIG_SERIAL_MULTI from config files ... Browse Code »

    Remove any notion of CONFIG_SERIAL_MULTI from board config files.
    Since CONFIG_SERIAL_MULTI is now enabled by default, it is useless
    to specify this config option in the board config files. Therefore
    remove it.

    Signed-off-by: Marek Vasut
    Cc: Marek Vasut
    Cc: Anatolij Gustschin
    Cc: Stefan Roese
    Signed-off-by: Tom Rini

    Marek Vasut
     

11 Sep, 2012

1 commit

08 Sep, 2012

1 commit

  • 573668a24   tegra: put eMMC environment into the boot sectors ... Browse Code »

    When I set up Tegra's config files to put the environment into eMMC, I
    assumed that CONFIG_ENV_OFFSET was a linearized address relative to the
    start of the eMMC device, and spanning HW partitions boot0, boot1,
    general* and the user area in order. However, it turns out that the
    offset is actually relative to the beginning of the user area. Hence,
    the environment block ended up in a different location to expected and
    documented.

    Set CONFIG_SYS_MMC_ENV_PART=2 (boot1) to solve this, and adjust
    CONFIG_ENV_OFFSET to be relative to the start of boot1, not the entire
    eMMC.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     

01 Sep, 2012

1 commit

  • 00a2749d7   tegra20: rename tegra2 -> tegra20 ... Browse Code »

    This is make naming consistent with the kernel and devicetree and in
    preparation of pulling out the common tegra20 code.

    Signed-off-by: Allen Martin
    Acked-by: Stephen Warren
    Tested-by: Thierry Reding
    Signed-off-by: Tom Warren

    Allen Martin
     

07 Jul, 2012

7 commits

  • 76e350b7a   arm: Tegra: Use ODMDATA from BCT in IRAM ... Browse Code »

    Walk the BIT and BCT to find the ODMDATA word in the
    CustomerData field and put it into Scratch20 reg for
    use by kernel, etc.

    Built all Tegra builds OK; Booted on Seaboard and saw
    ODMDATA in PMC scratch20 was the same as the value in my
    burn-u-boot.sh file (0x300D8011). NOTE: All flash utilities
    will have to specify the odmdata (nvflash --odmdata n) on
    the command line or via a cfg file, or built in to their
    BCT.

    Signed-off-by: Tom Warren
    Acked-by: Stephen Warren

    Tom Warren
     
  • e87c2bda9   tegra: paz00: store environment in eMMC ... Browse Code »

    Store the environment in eMMC, at the end of the second boot sector.
    This should not conflict with any other eMMC usage: U-Boot is stored
    well below this location, and the kernel only uses the general area
    of the eMMC once booted, not the boot sectors.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     
  • 3f82d89d3   mmc: tegra2: rename tegra2_mmc.* to tegra_mmc.* ... Browse Code »

    In anticipation of Tegra3 support, continue removing/renaming
    Tegra2-specific files. No functional changes (yet).
    Updated copyrights to 2012.

    Signed-off-by: Tom Warren

    Tom Warren
     
  • 59f8ac65f   tegra: remove CONFIG_USB_ETHER_SMSC95XX from boards without it ... Browse Code »

    The SMSC95xx series may exist either directly on a main board, or as a USB
    to Ethernet dongle. However, dongles containing these chips are very rare.
    Hence, remove this config option, except on Harmony where such a chip is
    actually present on the board.

    The asix option remains, since it's a popular chip, and I actively use a
    dongle containing this.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren
    Acked-by: Igor Grinberg

    Stephen Warren
     
  • 00a55add0   tegra: paz00: add device tree support ... Browse Code »

    ... to enable USB host support, which enables Ethernet support.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     
  • bea2674cc   tegra: flesh out bootcmd ... Browse Code »

    This implements a useful bootcmd for Tegra. The boot order is:

    * If USB enabled, USB storage
    * Internal MMC (SD card or eMMC)
    * If networking is enabled, BOOTP/TFTP

    When booting from USB or MMC, the boot script is assumed to be in
    partition 1 (although this may be overridden via the rootpart variable),
    both ext2 and FAT filesystems are supported, the boot script may exist
    in either / or /boot, and the boot script may be named boot.scr.uimg or
    boot.scr.

    When booting over the network, it is assumed that boot.scr.uimg exists
    on the TFTP server. There is less flexibility here since those setting
    up network booting are expected to need less hand-holding.

    In all cases, it is expected that the initial file loaded is a U-Boot
    image containing a script that will load the kernel, load any required
    initrd, load any required DTB, and finally bootm the kernel.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     
  • 07a84b7b1   tegra: remove some cruft from CONFIG_EXTRA_ENV_SETTINGS ... Browse Code »

    console isn't used by anything, and the kernel should be set appropriately
    by whatever script is booting the kernel, not imposed by the bootloader.

    mem might be useful, but the current value is pretty bogus, since it
    includes nvmem options that make no sense for an upstream kernel, and
    equally should not be required for any downstream kernel. Either way, this
    is also best left to the kernel boot script.

    smpflag isn't used by anything, and again was probably intended to be a
    kernel command-line option better set by the kernel boot script.

    Signed-off-by: Stephen Warren
    Signed-off-by: Tom Warren

    Stephen Warren
     

12 Feb, 2012

1 commit

  • 2996e2dcc   tegra2: Add support for Compal Paz00 (Toshiba AC100) ... Browse Code »

    The Toshiba AC100 (Compal code-name Paz00, aka Dynabook AZ) is a netbook
    derived from the NVIDIA Tegra Harmony reference board. It ships with
    Android, but is often repurposed to run Linux. This patch adds just enough
    support to get a U-Boot serial console, and the ability access built-in
    eMMC and the external SD slot.

    v2:
    * Rebased on latest HEAD, incorporated changes made to other board files.
    * Moved board files from board/nvidia to board/compal.
    * Switched to correct odmdata value. This required add the previous patch
    to fix U-Boot's interpretation of the odmdata RAM size field.
    * Removed nvmem= from default Linux kernel command-line; no drivers use the
    reserved memory yet, so there's no point reserving it.

    Signed-off-by: Stephen Warren
    Acked-by: Simon Glass
    Signed-off-by: Tom Warren

    Stephen Warren