diff options
author | Stefano Babic <sbabic@denx.de> | 2013-07-31 09:30:38 (GMT) |
---|---|---|
committer | Stefano Babic <sbabic@denx.de> | 2013-07-31 09:30:38 (GMT) |
commit | 326ea986ac150acdc7656d57fca647db80b50158 (patch) | |
tree | 15724288b8b6da3a98d934db8330bb964cdfdf36 /board/sacsng | |
parent | 4acb4d391f005c0c72f7b84041b3884e4260a5a4 (diff) | |
parent | fdce7b633a1de24456226b18527cc7900c34282a (diff) | |
download | u-boot-326ea986ac150acdc7656d57fca647db80b50158.tar.xz |
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>
Diffstat (limited to 'board/sacsng')
-rw-r--r-- | board/sacsng/Makefile | 18 | ||||
-rw-r--r-- | board/sacsng/clkinit.c | 18 | ||||
-rw-r--r-- | board/sacsng/clkinit.h | 18 | ||||
-rw-r--r-- | board/sacsng/flash.c | 18 | ||||
-rw-r--r-- | board/sacsng/ioconfig.h | 2 | ||||
-rw-r--r-- | board/sacsng/sacsng.c | 18 |
6 files changed, 6 insertions, 86 deletions
diff --git a/board/sacsng/Makefile b/board/sacsng/Makefile index d9e78ba..940a016 100644 --- a/board/sacsng/Makefile +++ b/board/sacsng/Makefile @@ -2,23 +2,7 @@ # (C) Copyright 2000-2006 # Wolfgang Denk, DENX Software Engineering, wd@denx.de. # -# See file CREDITS for list of people who contributed to this -# project. -# -# This program is free software; you can redistribute it and/or -# modify it under the terms of the GNU General Public License as -# published by the Free Software Foundation; either version 2 of -# the License, or (at your option) any later version. -# -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with this program; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, -# MA 02111-1307 USA +# SPDX-License-Identifier: GPL-2.0+ # include $(TOPDIR)/config.mk diff --git a/board/sacsng/clkinit.c b/board/sacsng/clkinit.c index 3894a5c..2a28037 100644 --- a/board/sacsng/clkinit.c +++ b/board/sacsng/clkinit.c @@ -3,23 +3,7 @@ * Custom IDEAS, Inc. <www.cideas.com> * Jon Diekema <diekema@cideas.com> * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/sacsng/clkinit.h b/board/sacsng/clkinit.h index 68d69db..3f759dd 100644 --- a/board/sacsng/clkinit.h +++ b/board/sacsng/clkinit.h @@ -3,23 +3,7 @@ * Custom IDEAS, Inc. <www.cideas.com> * Jon Diekema <diekema@cideas.com> * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #define SLRCLK_EN_MASK 0x00040000 /* PA13 - SLRCLK_EN* */ diff --git a/board/sacsng/flash.c b/board/sacsng/flash.c index 8b30f50..686fb22 100644 --- a/board/sacsng/flash.c +++ b/board/sacsng/flash.c @@ -2,23 +2,7 @@ * (C) Copyright 2001 * Wolfgang Denk, DENX Software Engineering, wd@denx.de. * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> diff --git a/board/sacsng/ioconfig.h b/board/sacsng/ioconfig.h index be1ce7c..ac8f152 100644 --- a/board/sacsng/ioconfig.h +++ b/board/sacsng/ioconfig.h @@ -187,7 +187,7 @@ const iop_conf_t iop_conf_tab[4][32] = { /* PD17 */ { CONF, SPEC, 1, DOUT, ACTV, 0 }, /* SPI_MOSI */ /* PD16 */ { CONF, SPEC, 1, DIN, ACTV, 0 }, /* SPI_MISO */ #endif -#if defined(CONFIG_SOFT_I2C) +#if defined(CONFIG_SYS_I2C_SOFT) /* PD15 */ { CONF, GPIO, 0, DOUT, OPEN, 1 }, /* I2C_SDA */ /* PD14 */ { CONF, GPIO, 0, DOUT, ACTV, 1 }, /* I2C_SCL */ #else diff --git a/board/sacsng/sacsng.c b/board/sacsng/sacsng.c index 536d7de..91c4987 100644 --- a/board/sacsng/sacsng.c +++ b/board/sacsng/sacsng.c @@ -3,23 +3,7 @@ * Custom IDEAS, Inc. <www.cideas.com> * Gerald Van Baren <vanbaren@cideas.com> * - * See file CREDITS for list of people who contributed to this - * project. - * - * This program is free software; you can redistribute it and/or - * modify it under the terms of the GNU General Public License as - * published by the Free Software Foundation; either version 2 of - * the License, or (at your option) any later version. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - * GNU General Public License for more details. - * - * You should have received a copy of the GNU General Public License - * along with this program; if not, write to the Free Software - * Foundation, Inc., 59 Temple Place, Suite 330, Boston, - * MA 02111-1307 USA + * SPDX-License-Identifier: GPL-2.0+ */ #include <common.h> |