Eric Lee / smarc-uboot

21 Nov, 2019

1 commit

  • a09fea1d2   env: Finish migration of common ENV options ... Browse Code »
    1

    - In ARMv8 NXP Layerscape platforms we also need to make use of
    CONFIG_SYS_RELOC_GD_ENV_ADDR now, do so.
    - On ENV_IS_IN_REMOTE, CONFIG_ENV_OFFSET is never used, drop the define
    to 0.
    - Add Kconfig entry for ENV_ADDR.
    - Make ENV_ADDR / ENV_OFFSET depend on the env locations that use it.
    - Add ENV_xxx_REDUND options that depend on their primary option and
    SYS_REDUNDAND_ENVIRONMENT
    - On a number of PowerPC platforms, use SPL_ENV_ADDR not CONFIG_ENV_ADDR
    for the pre-main-U-Boot environment location.
    - On ENV_IS_IN_SPI_FLASH, check not for CONFIG_ENV_ADDR being set but
    rather it being non-zero, as it will now be zero by default.
    - Rework the env_offset absolute in env/embedded.o to not use
    CONFIG_ENV_OFFSET as it was the only use of ENV_OFFSET within
    ENV_IS_IN_FLASH.
    - Migrate all platforms.

    Cc: Wolfgang Denk
    Cc: Joe Hershberger
    Cc: Patrick Delaunay
    Cc: uboot-stm32@st-md-mailman.stormreply.com
    Signed-off-by: Tom Rini
    Acked-by: Joe Hershberger
    Reviewed-by: Simon Goldschmidt

    Tom Rini
     

30 Apr, 2019

1 commit

09 Apr, 2019

1 commit

17 Aug, 2018

1 commit

  • 86cf1c828   configs: Migrate CONFIG_NR_DRAM_BANKS ... Browse Code »
    13

    We have the following cases:
    - CONFIG_NR_DRAM_BANKS was defined, migrate normally
    - CONFIG_NR_DRAM_BANKS_MAX was defined and then used for
    CONFIG_NR_DRAM_BANKS after a check, just migrate it over now.
    - CONFIG_NR_DRAM_BANKS was very oddly defined on p2771-0000-* (to 1024 +
    2), set this to 8.

    Signed-off-by: Tom Rini

    Tom Rini
     

22 Jul, 2018

1 commit

07 May, 2018

1 commit

  • 83d290c56   SPDX: Convert all of our single license tags to Linux Kernel style ... Browse Code »
    56

    When U-Boot started using SPDX tags we were among the early adopters and
    there weren't a lot of other examples to borrow from. So we picked the
    area of the file that usually had a full license text and replaced it
    with an appropriate SPDX-License-Identifier: entry. Since then, the
    Linux Kernel has adopted SPDX tags and they place it as the very first
    line in a file (except where shebangs are used, then it's second line)
    and with slightly different comment styles than us.

    In part due to community overlap, in part due to better tag visibility
    and in part for other minor reasons, switch over to that style.

    This commit changes all instances where we have a single declared
    license in the tag as both the before and after are identical in tag
    contents. There's also a few places where I found we did not have a tag
    and have introduced one.

    Signed-off-by: Tom Rini

    Tom Rini
     

09 Mar, 2018

1 commit

  • b996b7d42   ARM: Drop unreferenced CONFIG_* defines named after boards ... Browse Code »

    The following config symbols are only defined once and never referenced
    anywhere else:

    CONFIG_AT91SAM9263EK
    CONFIG_AT91SAM9RLEK
    CONFIG_BARIX_IPAM390
    CONFIG_BOARD_H2200
    CONFIG_EP9301
    CONFIG_KZM_A9_GT
    CONFIG_PICOSAM
    CONFIG_PLATINUM_PICON
    CONFIG_PLATINUM_TITANIUM
    CONFIG_PM9261
    CONFIG_PM9263
    CONFIG_PM9G45
    CONFIG_SIEMENS_DRACO
    CONFIG_SIEMENS_PXM2
    CONFIG_SIEMENS_RUT
    CONFIG_SMDKC100
    CONFIG_SMDKV310
    CONFIG_STM32F4DISCOVERY

    Most of them are config symbols named after the respective boards which
    seems to have been a standard practice at some point.

    Signed-off-by: Tuomas Tynkkynen

    Tuomas Tynkkynen
     

24 Feb, 2018

1 commit

  • d021e9421   Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig ... Browse Code »

    This converts the following to Kconfig:
    CONFIG_BOOTP_BOOTPATH
    CONFIG_BOOTP_DNS
    CONFIG_BOOTP_GATEWAY
    CONFIG_BOOTP_HOSTNAME
    CONFIG_BOOTP_PXE
    CONFIG_BOOTP_SUBNETMASK
    CONFIG_CMDLINE_EDITING
    CONFIG_AUTO_COMPLETE
    CONFIG_SYS_LONGHELP
    CONFIG_SUPPORT_RAW_INITRD
    CONFIG_ENV_VARS_UBOOT_CONFIG

    Signed-off-by: Adam Ford
    [trini: Re-run the migration]
    Signed-off-by: Tom Rini

    Adam Ford
     

11 Feb, 2018

1 commit

  • 278b90ce7   configs: Migrate CONFIG_SYS_TEXT_BASE ... Browse Code »
    15

    On the NIOS2 and Xtensa architectures, we do not have
    CONFIG_SYS_TEXT_BASE set. This is a strict migration of the current
    values into the defconfig and removing them from the headers.

    I did not attempt to add more default values in and for now will leave
    that to maintainers.

    Signed-off-by: Tom Rini

    Tom Rini
     

04 Sep, 2017

3 commits

15 Aug, 2017

1 commit

01 Aug, 2017

1 commit

  • 8f1a80e99   configs: Migrate CMD_NAND* ... Browse Code »

    Migrate all remaining instances of CMD_NAND, CMD_NAND_TRIMFFS
    CMD_NAND_LOCK_UNLOCK and CMD_NAND_TORTURE from the headers into the
    defconfig files.

    Tested-by: Adam Ford
    Signed-off-by: Tom Rini
    Reviewed-by: Bin Meng

    Tom Rini
     

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
     

23 May, 2017

1 commit

20 Mar, 2017

1 commit

13 Feb, 2017

1 commit

  • e856bdcfb   flash: complete CONFIG_SYS_NO_FLASH move with renaming ... Browse Code »
    20

    We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
    not completed. Finish this work by the tool.

    During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
    Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
    than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will
    make the code more readable. Besides, negative meaning symbols do
    not fit in obj-$(CONFIG_...) style Makefiles.

    This commit was created as follows:

    [1] Edit "default n" to "default y" in the config entry in
    common/Kconfig.

    [2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"

    [3] Rename the instances in defconfigs by the following:
    find . -path './configs/*_defconfig' | xargs sed -i \
    -e '/CONFIG_SYS_NO_FLASH=y/d' \
    -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'

    [4] Change the conditionals by the following:
    find . -name '*.[ch]' | xargs sed -i \
    -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
    -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
    -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
    -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'

    [5] Modify the following manually
    - Rename the rest of instances
    - Remove the description from README
    - Create the new Kconfig entry in drivers/mtd/Kconfig
    - Remove the old Kconfig entry from common/Kconfig
    - Remove the garbage comments from include/configs/*.h

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

29 Jan, 2017

1 commit

28 Jan, 2017

1 commit

26 Jan, 2017

1 commit

10 Sep, 2016

1 commit

10 Jun, 2016

1 commit

26 Apr, 2016

4 commits

25 Oct, 2015

1 commit

  • 09f3ca3dd   arm, powerpc: select SYS_GENERIC_BOARD ... Browse Code »

    We have finished Generic Board conversion for ARM and PowerPC, i.e.
    all the boards have been converted except OpenRISC, SuperH, SPARC,
    which have not supported Generic Board framework yet.

    Select SYS_GENERIC_BOARD in arch/Kconfig and delete all the macro
    defines in include/configs/*.h.

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

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
     

26 Jun, 2015

1 commit

13 Jan, 2015

1 commit

09 Dec, 2013

2 commits

10 Nov, 2013

1 commit

  • 85b8c5c4b   Merge branch 'iu-boot/master' into 'u-boot-arm/master' ... Browse Code »

    Conflicts:
    arch/arm/cpu/arm926ejs/mxs/Makefile
    board/compulab/cm_t35/Makefile
    board/corscience/tricorder/Makefile
    board/ppcag/bg0900/Makefile
    drivers/bootcount/Makefile
    include/configs/omap4_common.h
    include/configs/pdnb3.h

    Makefile conflicts are due to additions/removals of
    object files on the ARM branch vs KBuild introduction
    on the main branch. Resolution consists in adjusting
    the list of object files in the main branch version.
    This also applies to two files which are not listed
    as conflicting but had to be modified:

    board/compulab/common/Makefile
    board/udoo/Makefile

    include/configs/omap4_common.h conflicts are due to
    the OMAP4 conversion to ti_armv7_common.h on the ARM
    side, and CONFIG_SYS_HZ removal on the main side.
    Resolution is to convert as this icludes removal of
    CONFIG_SYS_HZ.

    include/configs/pdnb3.h is due to a removal on ARM side.
    Trivial resolution is to remove the file.

    Note: 'git show' will also list two files just because
    they are new:

    include/configs/am335x_igep0033.h
    include/configs/omap3_igep00x0.h

    Albert ARIBAUD
     

05 Nov, 2013

2 commits

24 Jul, 2013

1 commit

01 Sep, 2012

1 commit

21 Jun, 2012

2 commits