History log of /openbmc/u-boot/arch/x86/include/asm/u-boot.h (Results 1 – 25 of 49)
Revision Date Author Comments
# e8f80a5a 09-May-2018 Tom Rini <trini@konsulko.com>

Merge git://git.denx.de/u-boot-sunxi


# 83d290c5 06-May-2018 Tom Rini <trini@konsulko.com>

SPDX: Convert all of our single license tags to Linux Kernel style

When U-Boot started using SPDX tags we were among the early adopters and
there weren't a lot of other examples to borro

SPDX: Convert all of our single license tags to Linux Kernel style

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 <trini@konsulko.com>

show more ...


# 821560fd 27-Jun-2017 Tom Rini <trini@konsulko.com>

Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_gea

Merge git://www.denx.de/git/u-boot-imx

Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
include/configs/imx6qdl_icore_rqs.h
include/configs/imx6ul_geam.h
include/configs/imx6ul_isiot.h

show more ...


# 235c5b83 21-Jun-2017 Tom Rini <trini@konsulko.com>

Merge branch 'master' of git://git.denx.de/u-boot-samsung


# b9eaeae1 05-Jun-2017 Tom Rini <trini@konsulko.com>

Merge git://git.denx.de/u-boot-usb


# 6862b50f 17-May-2017 Simon Glass <sjg@chromium.org>

x86: Make u-boot-x86.h a private header

Rather than including this arch-specific header file in common.h, include
it from within x86's u-boot.h header.

Also drop the comment abo

x86: Make u-boot-x86.h a private header

Rather than including this arch-specific header file in common.h, include
it from within x86's u-boot.h header.

Also drop the comment about something to be fixed. It is not clear what
needs fixing.

Signed-off-by: Simon Glass <sjg@chromium.org>

show more ...


# 3be2bdf5 09-Oct-2013 Tom Rini <trini@ti.com>

Merge branch 'next' of git://git.denx.de/u-boot-mpc83xx


# 326ea986 31-Jul-2013 Stefano Babic <sbabic@denx.de>

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsab

Merge git://git.denx.de/u-boot-arm

Conflicts:
board/freescale/mx6qsabrelite/Makefile
board/freescale/mx6qsabrelite/mx6qsabrelite.c
include/configs/mx6qsabrelite.h

Signed-off-by: Stefano Babic <sbabic@denx.de>

show more ...


# 5b9c79a8 26-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://www.denx.de/git/u-boot-cfi-flash


# 8b485ba1 25-Jul-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot/master' into u-boot-arm/master


# aaf5e825 25-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-nds32


# c2120fbf 24-Jul-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-i2c

The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.

Conflicts:
bo

Merge branch 'master' of git://git.denx.de/u-boot-i2c

The sandburst-specific i2c drivers have been deleted, conflict was just
over the SPDX conversion.

Conflicts:
board/sandburst/common/ppc440gx_i2c.c
board/sandburst/common/ppc440gx_i2c.h

Signed-off-by: Tom Rini <trini@ti.com>

show more ...


# 1a459660 08-Jul-2013 Wolfgang Denk <wd@denx.de>

Add GPL-2.0+ SPDX-License-Identifier to source files

Signed-off-by: Wolfgang Denk <wd@denx.de>
[trini: Fixup common/cmd_io.c]
Signed-off-by: Tom Rini <trini@ti.com>


# efc284e3 12-Jul-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'


# e6c7f86f 28-Jun-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'


# 69f14dc2 19-Jun-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

Conflicts:
spl/Makefile


# 10e16732 08-Jun-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'

Conflicts:
drivers/serial/Makefile


# 47b8e527 07-Jun-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-video


# a19b0dd6 30-May-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot/master' into 'u-boot-arm/master'

Conflicts:
common/cmd_fpga.c
drivers/usb/host/ohci-at91.c


# 805fa87f 14-May-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-blackfin into powerpc-eldk53-warning-fixes


# a661b99d 13-May-2013 Tom Rini <trini@ti.com>

Merge branch 'master' of git://git.denx.de/u-boot-x86


# fa790fa0 17-Apr-2013 Simon Glass <sjg@chromium.org>

x86: Remove legacy board init code

Since we use CONFIG_SYS_GENERIC_BOARD on x86, we don't need this anymore.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Graeme Russ

x86: Remove legacy board init code

Since we use CONFIG_SYS_GENERIC_BOARD on x86, we don't need this anymore.

Signed-off-by: Simon Glass <sjg@chromium.org>
Acked-by: Graeme Russ <graeme.russ@gmail.com>

show more ...


# 345be0b2 14-Apr-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'


# 8dc16cf9 14-Apr-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'


# be08abc2 04-Apr-2013 Albert ARIBAUD <albert.u.boot@aribaud.net>

Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'


12