1.1 --- a/include/jz4740.h Tue Jun 09 23:11:32 2015 +0200
1.2 +++ b/include/jz4740.h Tue Jun 09 23:55:00 2015 +0200
1.3 @@ -1,12 +1,15 @@
1.4 /*
1.5 * Include file for Ingenic Semiconductor's JZ4740 CPU.
1.6 *
1.7 - * Copyright 2009 (C) Qi Hardware Inc.,
1.8 + * Copyright (C) 2006 - 2007 Ingenic Semiconductor Inc.
1.9 + * Copyright (C) 2009 Qi Hardware Inc.,
1.10 * Author: Xiangfu Liu <xiangfu@sharism.cc>
1.11 + * Copyright (C) 2015 Paul Boddie <paul@boddie.org.uk>
1.12 *
1.13 * This program is free software; you can redistribute it and/or
1.14 - * modify it under the terms of the GNU General Public License
1.15 - * version 3 as published by the Free Software Foundation.
1.16 + * modify it under the terms of the GNU General Public License as
1.17 + * published by the Free Software Foundation; either version 2 of
1.18 + * the License, or (at your option) any later version.
1.19 *
1.20 * This program is distributed in the hope that it will be useful,
1.21 * but WITHOUT ANY WARRANTY; without even the implied warranty of
1.22 @@ -23,6 +26,12 @@
1.23
1.24 #include "xburst_types.h"
1.25
1.26 +/* NOTE: Independent of usbboot parameters. */
1.27 +
1.28 +#define CONFIG_SYS_CPU_SPEED 336000000 /* CPU clock: 336 MHz */
1.29 +#define CONFIG_SYS_EXTAL 12000000 /* EXTAL freq: 12 MHz */
1.30 +#define CONFIG_SYS_HZ (CONFIG_SYS_EXTAL / 256) /* incrementer freq */
1.31 +
1.32 /* Boot ROM Specification */
1.33 /* NOR Boot config */
1.34 #define JZ4740_NORBOOT_8BIT 0x00000000 /* 8-bit data bus flash */
1.35 @@ -3196,11 +3205,6 @@
1.36 #define __cpm_suspend_usbphy() (REG_CPM_SCR |= CPM_SCR_USBPHY_DISABLE)
1.37 #define __cpm_enable_osc_in_sleep() (REG_CPM_SCR |= CPM_SCR_OSC_ENABLE)
1.38
1.39 -/* NOTE: Independent of usbboot parameters. */
1.40 -
1.41 -#define CONFIG_SYS_CPU_SPEED 336000000 /* CPU clock: 336 MHz */
1.42 -#define CONFIG_SYS_EXTAL 12000000 /* EXTAL freq: 12 MHz */
1.43 -#define CONFIG_SYS_HZ (CONFIG_SYS_EXTAL / 256) /* incrementer freq */
1.44 #define JZ_EXTAL CONFIG_SYS_EXTAL
1.45 #define JZ_EXTAL2 32768 /* RTC clock */
1.46