コミット: 444b39aa35557e40f1614d4cf408352708086b55 - uboot (git)

コミットメタ情報

• リビジョン: 444b39aa35557e40f1614d4cf408352708086b55 (tree)
• 日時: 2014-02-16 12:23:44
• 作者: Yoshinori Sato <ysato@user...>
• コミッター: Yoshinori Sato

ログメッセージ

renae vender

変更サマリ

• modified: arch/h8300/cpu/h8300h/cpu.c
• modified: arch/h8300/lib/time.c
• delete: board/{csun => nisshin-tech}/kanebebe/Makefile
• delete: board/{csun => nisshin-tech}/kanebebe/config.mk
• delete: board/{csun => nisshin-tech}/kanebebe/kanebebe-spi.c
• delete: board/{csun => nisshin-tech}/kanebebe/kanebebe.c
• delete: board/{csun => nisshin-tech}/kanebebe/lowlevel_init.S
• delete: board/{csun => nisshin-tech}/kanebebe/u-boot.lds
• delete: board/{csun => nisshin-tech}/kanebebe/u-boot.lds.ram
• modified: boards.cfg

差分

--- a/arch/h8300/cpu/h8300h/cpu.c
+++ b/arch/h8300/cpu/h8300h/cpu.c
@@ -27,7 +27,7 @@
 
 int checkcpu(void)
 {
-	puts("CPU: H8300H\n");
+	puts("CPU: H8/300H\n");
 	return 0;
 }
 

--- a/arch/h8300/lib/time.c
+++ b/arch/h8300/lib/time.c
@@ -57,7 +57,7 @@ unsigned long long get_ticks(void)
 
 ulong get_timer(ulong base)
 {
-	return get_ticks() / (CONFIG_SYS_CLK_FREQ / 1000) - base;
+	return get_ticks() / (CONFIG_SYS_HZ) - base;
 }
 
 void set_timer(ulong t)
@@ -76,12 +76,12 @@ void reset_timer(void)
 void __udelay(unsigned long usec)
 {
 	unsigned long long end = get_ticks() + 
-		(usec * (CONFIG_SYS_CLK_FREQ / 8000000));
+		(usec * (CONFIG_SYS_HZ / 8000000));
 
 	while (get_ticks() < end);
 }
 
 unsigned long get_tbclk(void)
 {
-	return CONFIG_SYS_CLK_FREQ / 8;
+	return CONFIG_SYS_HZ / 8;
 }

--- a/board/csun/kanebebe/Makefile
+++ b/board/nisshin-tech/kanebebe/Makefile
@@ -18,31 +18,5 @@
 # Foundation, Inc., 59 Temple Place, Suite 330, Boston,
 # MA 02111-1307 USA
 
-#include $(TOPDIR)/config.mk
-
-LIB	= lib$(BOARD).o
-
-OBJS	:= kanebebe.o
-SOBJS	:= lowlevel_init.o
-
-LIB	:= $(addprefix $(obj),$(LIB))
-OBJS	:= $(addprefix $(obj),$(OBJS))
-SOBJS	:= $(addprefix $(obj),$(SOBJS))
-
-$(LIB):	$(obj).depend $(OBJS) $(SOBJS)
-	$(AR) $(ARFLAGS) $@ $(OBJS) $(SOBJS)
-
-clean:
-	rm -f $(SOBJS) $(OBJS)
-
-distclean:	clean
-	rm -f $(LIB) core *.bak .depend
-
-#########################################################################
-
-# defines $(obj).depend target
-include $(SRCTREE)/rules.mk
-
-sinclude $(obj).depend
-
-#########################################################################
+obj-y	:= kanebebe.o lowlevel_init.o
+obj-$(CONFIG_BB_SPI) += kanebebe-spi.o

--- a/board/csun/kanebebe/kanebebe.c
+++ b/board/nisshin-tech/kanebebe/kanebebe.c
@@ -25,7 +25,7 @@
 
 int checkboard(void)
 {
-	puts("BOARD: csun KaneBebe\n");
+	puts("BOARD: nisshin-tech KaneBebe\n");
 	return 0;
 }
 

--- a/board/csun/kanebebe/u-boot.lds
+++ b/board/nisshin-tech/kanebebe/u-boot.lds
@@ -29,7 +29,7 @@ MEMORY
 	vector : ORIGIN = 0x000000, LENGTH = 4K
 	config : ORIGIN = 0x001000, LENGTH = 28K
 	irom : ORIGIN = 0x008000, LENGTH = 480K
-	dram : ORIGIN = 0x7a0000, LENGTH = 384K
+	dram : ORIGIN = 0x7b0000, LENGTH = 320K
 	/* 0xffbf20 - 0xffc720 using flash writer */
 	iram : ORIGIN = 0xffcf20, LENGTH = 12K
 }
@@ -59,7 +59,9 @@ SECTIONS
 	{
 		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
 		. = ALIGN(4);
-#include <u-boot.lst>
+	} > irom
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
 	} > irom
 	PROVIDE (_etext = .);
 

--- a/board/csun/kanebebe/u-boot.lds.ram
+++ b/board/nisshin-tech/kanebebe/u-boot.lds.ram
@@ -56,7 +56,9 @@ SECTIONS
 	{
 		*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
 		. = ALIGN(4);
-#include "u-boot.lst"
+	} > dram
+	.u_boot_list : {
+		KEEP(*(SORT(.u_boot_list*)));
 	} > dram
 	PROVIDE (__etext = .);
 

--- a/boards.cfg
+++ b/boards.cfg
@@ -447,7 +447,7 @@ Active  blackfin    blackfin       -           -               -
 Active  blackfin    blackfin       -           -               -                   tcm-bf537                            -                                                                                                                                 Bluetechnix Tinyboards <[e-mail]>
 Active  blackfin    blackfin       -           -               bf527-ezkit         bf527-ezkit-v2                       bf527-ezkit:BF527_EZKIT_REV_2_1                                                                                                   Sonic Zhang <[e-mail]>:Blackfin Team <[e-mail]>
 Active  h8300	    h8300h	  -             -              h8300h_sim          h8300h_sim                     	h8300h_sim                                                                             	                     	  		  Yoshinori Sato <[e-mail]>
-Active  h8300       h8300h       -             csun	       kanebebe            kanebebe                             kanebebe                                                                              						  Yoshinori Sato <[e-mail]>
+Active  h8300       h8300h       -             nisshin-tech    kanebebe            kanebebe                             kanebebe                                                                              						  Yoshinori Sato <[e-mail]>
 Active  h8300       h8300s       -             -	       h8300s_sim            h8300s_sim                         h8300s_sim                                                                              					  Yoshinori Sato <[e-mail]>
 Active  h8300       h8300s       -             renesas	       edosk2674            edosk2674                         edosk2674                                                                              					  Yoshinori Sato <[e-mail]>
 Active  m68k        mcf5227x       -           freescale       m52277evb           M52277EVB_stmicro                    M52277EVB:CF_SBF,SYS_STMICRO_BOOT,SYS_TEXT_BASE=0x43E00000                                                                        TsiChung Liew <[e-mail]>