# HG changeset patch # User Paul Boddie # Date 1434310325 -7200 # Node ID d81fbf93be637b14bd7ae28849a078449cec2b46 # Parent 3409e830613438598dbf5a5c4631ac20fbd139bd Fixed minor licensing details and reformatted boilerplate. diff -r 3409e8306134 -r d81fbf93be63 include/jz4730.h --- a/include/jz4730.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/jz4730.h Sun Jun 14 21:32:05 2015 +0200 @@ -2,7 +2,7 @@ * Include file for Ingenic Semiconductor's JZ4730 CPU. * * Copyright (C) 2006 - 2007 Ingenic Semiconductor Inc. - * Copyright (C) 2009 Qi Hardware Inc., + * Copyright (C) 2009 Qi Hardware Inc. * Author: Xiangfu Liu * Copyright (C) 2015 Paul Boddie * diff -r 3409e8306134 -r d81fbf93be63 include/jz4730_compat.h --- a/include/jz4730_compat.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/jz4730_compat.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,12 +1,12 @@ /* - * Compatibility definitions for using jz4740 code with the jz4730 + * Compatibility definitions for using jz4740 code with the jz4730. * * Copyright (C) 2015 Paul Boddie * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -14,9 +14,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ #ifndef __JZ4730_COMPAT_H__ diff -r 3409e8306134 -r d81fbf93be63 include/jz4740.h --- a/include/jz4740.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/jz4740.h Sun Jun 14 21:32:05 2015 +0200 @@ -2,7 +2,7 @@ * Include file for Ingenic Semiconductor's JZ4740 CPU. * * Copyright (C) 2006 - 2007 Ingenic Semiconductor Inc. - * Copyright (C) 2009 Qi Hardware Inc., + * Copyright (C) 2009 Qi Hardware Inc. * Author: Xiangfu Liu * Copyright (C) 2015 Paul Boddie * diff -r 3409e8306134 -r d81fbf93be63 include/minipc.h --- a/include/minipc.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/minipc.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,14 +1,14 @@ /* - * MiniPC configuration parameters + * MiniPC configuration parameters. * * Copyright (C) 2009 Qi Hardware Inc. * Authors: Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -16,9 +16,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ #ifndef __MINIPC_H__ diff -r 3409e8306134 -r d81fbf93be63 include/nanonote.h --- a/include/nanonote.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/nanonote.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,14 +1,14 @@ /* - * Ben NanoNote configuration parameters + * Ben NanoNote configuration parameters. * * Copyright (C) 2009 Qi Hardware Inc. * Authors: Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -16,9 +16,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ #ifndef __NANONOTE_H__ diff -r 3409e8306134 -r d81fbf93be63 include/sdram.h --- a/include/sdram.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/sdram.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,14 +1,14 @@ /* - * Common SDRAM configuration + * Common SDRAM configuration. * * Copyright (C) 2009 Qi Hardware Inc. * Authors: Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -16,9 +16,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ #ifndef __SDRAM_H__ diff -r 3409e8306134 -r d81fbf93be63 include/usb_boot_defines.h --- a/include/usb_boot_defines.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/usb_boot_defines.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,5 +1,7 @@ /* - * Copyright(C) 2009 Qi Hardware Inc., + * USB boot definitions. + * + * Copyright (C) 2009 Qi Hardware Inc. * Authors: Marek Lindner * Xiangfu Liu * diff -r 3409e8306134 -r d81fbf93be63 include/xburst_types.h --- a/include/xburst_types.h Sun Jun 14 21:17:08 2015 +0200 +++ b/include/xburst_types.h Sun Jun 14 21:32:05 2015 +0200 @@ -1,11 +1,13 @@ /* - * Copyright 2009 (C) Qi Hardware Inc., + * Ingenic XBurst type definitions. + * + * Copyright 2009 (C) Qi Hardware Inc. * Author: Xiangfu Liu * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -13,9 +15,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ #ifndef __XBURST_TYPES_H__ diff -r 3409e8306134 -r d81fbf93be63 stage1/Makefile --- a/stage1/Makefile Sun Jun 14 21:17:08 2015 +0200 +++ b/stage1/Makefile Sun Jun 14 21:32:05 2015 +0200 @@ -3,18 +3,18 @@ # Copyright (C) 2015 Paul Boddie # Copyright (C) Xiangfu Liu # -# 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 3 of the License, or (at your option) any later -# version. +# 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 3 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. +# 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, see . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . ARCH = mipsel-linux-gnu CC = $(ARCH)-gcc diff -r 3409e8306134 -r d81fbf93be63 stage1/board.c --- a/stage1/board.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage1/board.c Sun Jun 14 21:32:05 2015 +0200 @@ -7,18 +7,18 @@ * Copyright (C) Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifdef CONFIG_CPU_JZ4730 diff -r 3409e8306134 -r d81fbf93be63 stage1/head1.S --- a/stage1/head1.S Sun Jun 14 21:17:08 2015 +0200 +++ b/stage1/head1.S Sun Jun 14 21:32:05 2015 +0200 @@ -1,16 +1,15 @@ /* - * Entry point of the firmware. - * The firmware code is executed in the ICache. + * Initialisation for the stage 1 payload with support for boot parameters. * - * Copyright 2009 (C) Qi Hardware Inc. + * Copyright (C) 2009 Qi Hardware Inc. * Author: Wolfgang Spraul * * Copyright (C) 2015 Paul Boddie * - * 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 - * 3 of the License, or (at your option) any later version. + * 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 3 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 @@ -18,9 +17,7 @@ * 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., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301, USA + * along with this program. If not, see . */ .text diff -r 3409e8306134 -r d81fbf93be63 stage1/stage1.c --- a/stage1/stage1.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage1/stage1.c Sun Jun 14 21:32:05 2015 +0200 @@ -4,18 +4,18 @@ * Copyright (C) 2015 Paul Boddie * Copyright (C) Wolfgang Spraul * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include "board.h" diff -r 3409e8306134 -r d81fbf93be63 stage2/Makefile --- a/stage2/Makefile Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/Makefile Sun Jun 14 21:32:05 2015 +0200 @@ -3,18 +3,18 @@ # Copyright (C) 2015 Paul Boddie # Copyright (C) Xiangfu Liu # -# 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 3 of the License, or (at your option) any later -# version. +# 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 3 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. +# 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, see . +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . ARCH = mipsel-linux-gnu CC = $(ARCH)-gcc diff -r 3409e8306134 -r d81fbf93be63 stage2/board-minipc.c --- a/stage2/board-minipc.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/board-minipc.c Sun Jun 14 21:32:05 2015 +0200 @@ -6,18 +6,18 @@ * Copyright (C) Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include "board.h" diff -r 3409e8306134 -r d81fbf93be63 stage2/board-nanonote.c --- a/stage2/board-nanonote.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/board-nanonote.c Sun Jun 14 21:32:05 2015 +0200 @@ -6,18 +6,18 @@ * Copyright (C) Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include "board.h" diff -r 3409e8306134 -r d81fbf93be63 stage2/board.c --- a/stage2/board.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/board.c Sun Jun 14 21:32:05 2015 +0200 @@ -5,18 +5,18 @@ * Copyright (C) Xiangfu Liu * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #include "sdram.h" diff -r 3409e8306134 -r d81fbf93be63 stage2/head2.S --- a/stage2/head2.S Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/head2.S Sun Jun 14 21:32:05 2015 +0200 @@ -1,9 +1,23 @@ /* - * Entry point of the firmware. - * The firmware code are executed in the ICache. - * Do not edit! - * Copyright (C) 2006 Ingenic Semiconductor Inc. + * Initialisation code for the stage 2 payload. + * + * Copyright 2009 (C) Qi Hardware Inc. + * Author: Wolfgang Spraul + * + * Copyright (C) 2015 Paul Boddie * + * 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 3 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, see . */ .text @@ -12,7 +26,7 @@ .globl _start .set noreorder _start: - add $29, $20, 0x3ffff0 // sp locate at start address offset 0x2ffff0 + add $29, $20, 0x3ffff0 /* sp */ j c_main .set reorder diff -r 3409e8306134 -r d81fbf93be63 stage2/lcd.c --- a/stage2/lcd.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/lcd.c Sun Jun 14 21:32:05 2015 +0200 @@ -4,18 +4,18 @@ * Copyright (C) 2001-2002 Wolfgang Denk, DENX Software Engineering, * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifdef CONFIG_CPU_JZ4730_MINIPC diff -r 3409e8306134 -r d81fbf93be63 stage2/stage2.c --- a/stage2/stage2.c Sun Jun 14 21:17:08 2015 +0200 +++ b/stage2/stage2.c Sun Jun 14 21:32:05 2015 +0200 @@ -4,18 +4,18 @@ * Copyright (C) Wolfgang Spraul * Copyright (C) 2015 Paul Boddie * - * 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 3 of the License, or (at your option) any later - * version. + * 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 3 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. + * 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, see . + * You should have received a copy of the GNU General Public License + * along with this program. If not, see . */ #ifdef CONFIG_CPU_JZ4730_MINIPC