Commit: 8c2fe29035f078836c51aa99106a0ec82190feb2 - uboot (git)

Commit MetaInfo

• Revisión: 8c2fe29035f078836c51aa99106a0ec82190feb2 (tree)
• Tiempo: 2019-06-13 12:26:16
• Autor: Yoshinori Sato <ysato@user...>
• Commiter: Yoshinori Sato

Log Message

h8300 update

Cambiar Resumen

• modified: Kconfig
• modified: Makefile
• modified: arch/Kconfig
• modified: arch/h8300/Kconfig
• modified: arch/h8300/cpu/h8300h/start.S
• modified: arch/h8300/dts/kanebebe.dts
• modified: arch/h8300/include/asm/bitops.h
• modified: arch/h8300/include/asm/config.h
• add: arch/h8300/include/asm/linkage.h
• modified: arch/h8300/lib/Makefile
• modified: board/nisshin-tech/kanebebe/kanebebe.c
• modified: cmd/bdinfo.c
• delete: cpu/h8300h/Makefile
• delete: cpu/h8300h/config.mk
• delete: cpu/h8300h/cpu.c
• delete: cpu/h8300h/interrupts.c
• delete: cpu/h8300h/start.S
• delete: cpu/h8300h/watchdog.c
• modified: drivers/core/device.c
• modified: drivers/i2c/mxc_i2c.c
• modified: drivers/serial/Kconfig
• modified: drivers/serial/serial_sh.c
• modified: drivers/serial/serial_sh.h
• modified: include/configs/kanebebe.h
• modified: include/image.h

Diferencia incremental

--- a/Kconfig
+++ b/Kconfig
@@ -107,6 +107,7 @@ config ENV_VARS_UBOOT_CONFIG
 
 config NR_DRAM_BANKS
 	int "Number of DRAM banks"
+	depends on !H8300
 	default 4
 	help
 	  This defines the number of DRAM banks.
@@ -500,7 +501,7 @@ config SYS_EXTRA_OPTIONS
 	  new boards should not use this option.
 
 config SYS_TEXT_BASE
-	depends on !NIOS2 && !XTENSA
+	depends on !NIOS2 && !XTENSA && !H8300
 	depends on !EFI_APP
 	default 0x80800000 if ARCH_OMAP2PLUS || ARCH_K3
 	default 0x4a000000 if ARCH_SUNXI && !MACH_SUN9I && !MACH_SUN8I_V3S

--- a/Makefile
+++ b/Makefile
@@ -887,7 +887,7 @@ LDFLAGS_u-boot += $(LDFLAGS_FINAL)
 # Avoid 'Not enough room for program headers' error on binutils 2.28 onwards.
 LDFLAGS_u-boot += $(call ld-option, --no-dynamic-linker)
 
-ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA),)
+ifeq ($(CONFIG_ARC)$(CONFIG_NIOS2)$(CONFIG_X86)$(CONFIG_XTENSA)$(CONFIG_H8300),)
 LDFLAGS_u-boot += -Ttext $(CONFIG_SYS_TEXT_BASE)
 endif
 

--- a/arch/Kconfig
+++ b/arch/Kconfig
@@ -3,7 +3,6 @@ config CREATE_ARCH_SYMLINK
 
 config HAVE_ARCH_IOREMAP
 	bool
-	depends on HAVE_GENERIC_BOARD
 
 choice
 	prompt "Architecture select"
@@ -15,8 +14,6 @@ config ARC
 	select ARC_TIMER
 	select CLK
 	select HAVE_PRIVATE_LIBGCC
-	select HAVE_GENERIC_BOARD
-	select SYS_GENERIC_BOARD
 	select SUPPORT_OF_CONTROL
 	select TIMER
 
@@ -26,14 +23,9 @@ config ARM
 	select HAVE_PRIVATE_LIBGCC if !ARM64
 	select SUPPORT_OF_CONTROL
 
-config AVR32
-	bool "AVR32 architecture"
-	select HAVE_GENERIC_BOARD
-
-config BLACKFIN
-	bool "Blackfin architecture"
-	select HAVE_GENERIC_BOARD
-	select SYS_GENERIC_BOARD
+config H8300
+	bool "H8/300 architecture"
+	select SUPPORT_OF_CONTROL
 
 config M68K
 	bool "M68000 architecture"
@@ -44,8 +36,6 @@ config M68K
 
 config MICROBLAZE
 	bool "MicroBlaze architecture"
-	select HAVE_GENERIC_BOARD
-	select SYS_GENERIC_BOARD
 	select SUPPORT_OF_CONTROL
 	imply CMD_IRQ
 
@@ -70,7 +60,6 @@ config NIOS2
 config PPC
 	bool "PowerPC architecture"
 	select HAVE_PRIVATE_LIBGCC
-	select HAVE_GENERIC_BOARD
 	select SUPPORT_OF_CONTROL
 	select SYS_BOOT_GET_CMDLINE
 	select SYS_BOOT_GET_KBD
@@ -101,7 +90,6 @@ config SANDBOX
 	select DM_KEYBOARD
 	select DM_MMC
 	select DM_SERIAL
-	select DM_I2C
 	select DM_SPI
 	select DM_SPI_FLASH
 	select HAVE_BLOCK_DEVICE
@@ -141,9 +129,6 @@ config SH
 	bool "SuperH architecture"
 	select HAVE_PRIVATE_LIBGCC
 
-config SPARC
-	bool "SPARC architecture"
-
 config X86
 	bool "x86 architecture"
 	select SUPPORT_SPL
@@ -291,19 +276,15 @@ config SYS_DISABLE_DCACHE_OPS
 
 source "arch/arc/Kconfig"
 source "arch/arm/Kconfig"
-source "arch/avr32/Kconfig"
-source "arch/blackfin/Kconfig"
 source "arch/h8300/Kconfig"
 source "arch/m68k/Kconfig"
 source "arch/microblaze/Kconfig"
 source "arch/mips/Kconfig"
 source "arch/nds32/Kconfig"
 source "arch/nios2/Kconfig"
-source "arch/openrisc/Kconfig"
 source "arch/powerpc/Kconfig"
 source "arch/sandbox/Kconfig"
 source "arch/sh/Kconfig"
-source "arch/sparc/Kconfig"
 source "arch/x86/Kconfig"
 source "arch/xtensa/Kconfig"
 source "arch/riscv/Kconfig"

--- a/arch/h8300/Kconfig
+++ b/arch/h8300/Kconfig
@@ -41,6 +41,13 @@ config SYS_CPU
 	default "h8300h" if CPU_H8300H
 	default "h8300s" if CPU_H8S
 
+config CPU_H83069
+       bool
+
+config TIMER_BASE
+       hex
+       default 0xffff80
+
 source "board/h8300h_sim/Kconfig"
 source "board/h8300s_sim/Kconfig"
 source "board/ae3069/Kconfig"

--- a/arch/h8300/cpu/h8300h/start.S
+++ b/arch/h8300/cpu/h8300h/start.S
@@ -50,8 +50,9 @@ _start:
 	bne	1b
 	mov.l	#_run_stack,sp
 	mov.l	sp,er0
-	jsr	@board_init_f_mem
+	jsr	@board_init_f_alloc_reserve
 	mov.l	er0,sp
+	jsr	@board_init_f_init_reserve
 	sub.l	er0,er0			/* boot flags */
 	jsr	@board_init_f
 	bra	.

--- a/arch/h8300/dts/kanebebe.dts
+++ b/arch/h8300/dts/kanebebe.dts
@@ -7,7 +7,7 @@
 	interrupt-parent = <&h8intc>;
 
 	chosen {
-		stdout-path = &sci1;
+		stdout-path = &sci0;
 	};
 	aliases {
 		serial0 = &sci0;
@@ -36,8 +36,7 @@
 		clock-mult = <1>;
 	};
 
-	memory@400000 {
-		device_type = "memory";
+	memory {
 		reg = <0x400000 0x400000>;
 	};
 

--- a/arch/h8300/include/asm/bitops.h
+++ b/arch/h8300/include/asm/bitops.h
@@ -182,5 +182,7 @@ static __inline__ unsigned long __ffs(unsigned long word)
 	return result;
 }
 
+#include <asm-generic/bitops/fls.h>
+#include <asm-generic/bitops/fls64.h>
 
 #endif /* _H8300_BITOPS_H */

--- a/arch/h8300/include/asm/config.h
+++ b/arch/h8300/include/asm/config.h
@@ -21,6 +21,4 @@
 #ifndef _ASM_CONFIG_H_
 #define _ASM_CONFIG_H_
 
-#define CONFIG_RELOC_FIXUP_WORKS
-
 #endif

--- /dev/null
+++ b/arch/h8300/include/asm/linkage.h
@@ -0,0 +1,11 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
+/*
+ * U-Boot - linkage.h
+ *
+ * Copyright (c) 2005-2007 Analog Devices Inc.
+ */
+
+#ifndef __ASM_LINKAGE_H
+#define __ASM_LINKAGE_H
+
+#endif

--- a/arch/h8300/lib/Makefile
+++ b/arch/h8300/lib/Makefile
@@ -7,4 +7,4 @@
 # SPDX-License-Identifier:	GPL-2.0+
 #
 
-obj-y	= bootm.o time.o gpio.o gd.o
+obj-y	= bootm.o gd.o time.o #gpio.o 

--- a/board/nisshin-tech/kanebebe/kanebebe.c
+++ b/board/nisshin-tech/kanebebe/kanebebe.c
@@ -34,22 +34,15 @@ void n9604_udc_probe(void);
 
 int board_early_init_f(void)
 {
+#if 0
 	h8300_gpio_init();
+#endif
 #ifdef CONFIG_USB_GADGET_N9604
 	n9604_udc_probe();
 #endif
 	return 0;
 }
 
-void dram_init_banksize(void)
-{
-	DECLARE_GLOBAL_DATA_PTR;
-
-	gd->bd->bi_memstart = CONFIG_SYS_DRAM_BASE;
-	gd->bd->bi_memsize = CONFIG_SYS_DRAM_SIZE;
-	gd->ram_size = CONFIG_SYS_DRAM_SIZE;
-}
-
 #if defined(CONFIG_CMD_NET) && !defined(CONFIG_DM_ETH)
 int board_eth_init(bd_t *bis)
 {
@@ -66,9 +59,9 @@ int board_eth_init(bd_t *bis)
 
 int board_late_init(void)
 {
+#ifdef CONFIG_CMD_MMC
 	DECLARE_GLOBAL_DATA_PTR;
 
-#ifdef CONFIG_CMD_MMC
 	mmc_initialize(gd->bd);
 #endif
 #ifdef CONFIG_CMD_LED
@@ -78,3 +71,16 @@ int board_late_init(void)
 
 	return 0;
 }
+
+int dram_init(void)
+{
+        if (fdtdec_setup_mem_size_base() != 0)
+                return -EINVAL;
+
+        return 0;
+}
+
+int dram_init_banksize(void)
+{
+        return 0;
+}

--- a/cmd/bdinfo.c
+++ b/cmd/bdinfo.c
@@ -455,6 +455,18 @@ int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
 	return 0;
 }
 
+#elif defined(CONFIG_H8300)
+
+int do_bdinfo(cmd_tbl_t *cmdtp, int flag, int argc, char * const argv[])
+{
+	bd_t *bd = gd->bd;
+
+	print_bi_mem(bd);
+	print_eth_ip_addr();
+	print_baudrate();
+	return 0;
+}
+
 #else
  #error "a case for this architecture does not exist!"
 #endif

--- a/cpu/h8300h/Makefile
+++ /dev/null
@@ -1,12 +0,0 @@
-#
-# (C) Copyright 2000-2006
-# Wolfgang Denk, DENX Software Engineering, [e-mail].
-#
-# Copyright (C) 2014 Yoshinori Sato <[e-mail]>
-# Copyright (C) 2008 Renesas Solutions Corp.
-#
-# SPDX-License-Identifier:	GPL-2.0+
-#
-
-extra-y	= start.o
-obj-y	= cpu.o interrupts.o watchdog.o

--- a/cpu/h8300h/config.mk
+++ /dev/null
@@ -1,27 +0,0 @@
-#
-# Copyright (C) 2010 Yoshinori Sato <[e-mail]>
-#
-# 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
-#
-#
-PLATFORM_CPPFLAGS += -mh -Wa,--mach=h8300h
-CFLAGS += -mh
-USE_PRIVATE_LIBGCC = $(shell dirname `$(CC) $(CFLAGS) -mh -print-libgcc-file-name`)
-LDEMUL = -mh8300helf_linux
-LDFLAGS += $(LDEMUL)

--- a/cpu/h8300h/cpu.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/*
- * Copyright (C) 2010 Yoshinori Sato <[e-mail]>
- *
- * 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
- */
-
-#include <common.h>
-#include <command.h>
-#include <asm/processor.h>
-#include <asm/io.h>
-
-int checkcpu(void)
-{
-	puts("CPU: H8/300H\n");
-	return 0;
-}
-
-int arch_cpu_init(void)
-{
-	DECLARE_GLOBAL_DATA_PTR;
-	gd->ram_size = CONFIG_SYS_DRAM_SIZE;
-	gd->cpu_clk = CONFIG_SYS_CLK_FREQ;
-	return 0;
-}
-
-int cleanup_before_linux(void)
-{
-	disable_interrupts();
-	return 0;
-}
-
-int do_reset(cmd_tbl_t *cmdtp, int flag, int argc,  char * const argv[])
-{
-	disable_interrupts();
-	reset_cpu(0);
-	return 0;
-}
-
-void flush_cache(unsigned long addr, unsigned long size)
-{
-
-}
-
-void icache_enable(void)
-{
-}
-
-void icache_disable(void)
-{
-}
-
-int icache_status(void)
-{
-	return 0;
-}
-
-void dcache_enable(void)
-{
-}
-
-void dcache_disable(void)
-{
-}
-
-int dcache_status(void)
-{
-	return 0;
-}

--- a/cpu/h8300h/interrupts.c
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * Copyright 2010 Yoshinori Sato <[e-mail]>
- *
- * 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
- */
-
-#include <common.h>
-
-int interrupt_init(void)
-{
-	return 0;
-}
-
-void enable_interrupts(void)
-{
-
-}
-
-int disable_interrupts(void)
-{
-	return 0;
-}

--- a/cpu/h8300h/start.S
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (C) 2010 Yoshinori Sato <[e-mail]>
-
- * 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
- */
-
-#include <config.h>
-#include <version.h>
-
-	.h8300h
-
-	.section	".vector","ax"
-	.global	_start
-	.global	relocate_code
-	.long	_start
-vector	=	1
-	.rept	63
-	.long	__ram_vec + (vector * 4)
-vector	=	vector + 1
-	.endr
-
-	.text
-	.align	2
-_start:
-	mov.l	#__init_stack,sp
-	jsr	@_lowlevel_init
-
-	mov.l	#__bss_start,er4
-	mov.l	#__bss_end,er5
-	sub	er4,er5
-	shlr.l	er5
-	shlr.l	er5
-	sub.l	er0,er0
-1:	mov.l	er0,@er4		/* bss clear */
-	adds	#4,er4
-	dec.l	#1,er5
-	bne	1b
-
-	mov.l	#_run_stack,sp
-	mov.l	sp,er0
-	jsr	@board_init_f_mem
-	mov.l	er0,sp
-	sub.l	er0,er0			/* boot flags */
-	jsr	@board_init_f
-	bra	.
-
-relocate_code:
-	mov.l	er1,er0
-	sub.l	er1,er1
-	jmp	@board_init_r
-
-	.end

--- a/cpu/h8300h/watchdog.c
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- * Copyright (C) 2010 Yoshinori Sato <[e-mail]>
- *
- * 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
- */
-
-#include <common.h>
-#include <asm/processor.h>
-
-int watchdog_init(void)
-{
-	return 0;
-}
-
-void reset_cpu(unsigned long ignored)
-{
-	while (1)
-		;
-}

--- a/drivers/core/device.c
+++ b/drivers/core/device.c
@@ -294,7 +294,7 @@ static void *alloc_priv(int size, uint flags)
 			 * TODO([e-mail]): Drop this microblaze
 			 * exception.
 			 */
-#ifndef CONFIG_MICROBLAZE
+#if !defined(CONFIG_MICROBLAZE) && !defined(CONFIG_H8300)
 			flush_dcache_range((ulong)priv, (ulong)priv + size);
 #endif
 		}

--- a/drivers/i2c/mxc_i2c.c
+++ b/drivers/i2c/mxc_i2c.c
@@ -645,19 +645,6 @@ static int bus_i2c_write(struct mxc_i2c_bus *i2c_bus, u8 chip, u32 addr,
 	return ret;
 }
 
-static struct mxc_i2c_bus mxc_i2c_buses[] = {
-
-	ret = i2c_init_transfer(i2c_bus, chip, addr, alen);
-	if (ret < 0)
-		return ret;
-
-	ret = i2c_write_data(i2c_bus, chip, buf, len);
-
-	i2c_imx_stop(i2c_bus);
-
-	return ret;
-}
-
 #if !defined(I2C2_BASE_ADDR)
 #define I2C2_BASE_ADDR	0
 #endif

--- a/drivers/serial/Kconfig
+++ b/drivers/serial/Kconfig
@@ -656,7 +656,7 @@ config SANDBOX_SERIAL
 
 config SCIF_CONSOLE
 	bool "Renesas SCIF UART support"
-	depends on SH || ARCH_RMOBILE
+	depends on SH || ARCH_RMOBILE || H8300
 	help
 	  Select this to enable Renesas SCIF UART. To operate serial ports
 	  on systems with RCar or SH SoCs, say Y to this option. If unsure,

--- a/drivers/serial/serial_sh.c
+++ b/drivers/serial/serial_sh.c
@@ -36,7 +36,7 @@ static int scif_rxfill(struct uart_port *port)
 		return sci_in(port, SCFDR) & SCIF2_RFDC_MASK;
 	}
 }
-#elif defined(CONFIG_SCI)
+#elif defined(CONFIG_H8300)
 static int scif_rxfill(struct uart_port *port)
 {
 	return (sci_in(port, SCxSR) & SCxSR_RDxF(port))?1:0;

--- a/drivers/serial/serial_sh.h
+++ b/drivers/serial/serial_sh.h
@@ -56,20 +56,6 @@ struct uart_port {
 # define SCSPTR5 0xFFE45020
 # define SCIF_ORER 0x0001  /* overrun error bit */
 # define SCSCR_INIT(port) 0x0038  /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
-#elif defined(CONFIG_CPU_H83007) || \
-	defined(CONFIG_CPU_H83068) || \
-	defined(CONFIG_CPU_H83069)
-# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define H8300_SCI_DR(ch) (*(volatile char *)(P1DR + h8300_sci_pins[ch].port))
-# define SCIF0_BASE 0xffffb0 
-# define SCIF1_BASE 0xffffb8 
-# define SCIF2_BASE 0xffffc0 
-#elif defined(CONFIG_CPU_H8S2678)
-# define SCSCR_INIT(port)          0x30 /* TIE=0,RIE=0,TE=1,RE=1 */
-# define H8300_SCI_DR(ch) (*(volatile char *)(P1DR + h8300_sci_pins[ch].port))
-# define SCIF0_BASE 0xffff78 
-# define SCIF1_BASE 0xffff80 
-# define SCIF2_BASE 0xffff88 
 #elif defined(CONFIG_CPU_SH7757) || \
 	defined(CONFIG_CPU_SH7752) || \
 	defined(CONFIG_CPU_SH7753)
@@ -113,6 +99,8 @@ struct uart_port {
 # endif
 # define SCSCR_INIT(port)	(port->clk_mode == EXT_CLK ? 0x32 : 0x30)
 				/* TIE=0,RIE=0,TE=1,RE=1,REIE=0, */
+#elif defined(CONFIG_H8300)
+# define SCSCR_INIT(port)	0x38 /* TIE=0,RIE=0,TE=1,RE=1,REIE=1 */
 #else
 # error CPU subtype not defined
 #endif
@@ -183,6 +171,10 @@ struct uart_port {
 # else
 #  define SCIF_RFDC_MASK	0x001f
 # endif
+#elif defined(CONFIG_H8300)
+# define SCIF_ERRORS (SCI_ORER | SCI_FER | SCI_PER)
+# define SCIF_RFDC_MASK 0x00
+# define SCIF_TXROOM_MAX 1
 #else
 # define SCIF_ERRORS (SCIF_PER | SCIF_FER | SCIF_ER | SCIF_BRK)
 # define SCIF_RFDC_MASK 0x001f
@@ -194,7 +186,7 @@ struct uart_port {
 #endif
 
 #define SCxSR_TEND(port)\
-		(((port)->type == PORT_SCI) ? SCI_TDRE	: SCIF_TEND)
+		(((port)->type == PORT_SCI) ? SCI_TEND	: SCIF_TEND)
 #define SCxSR_ERRORS(port)\
 		(((port)->type == PORT_SCI) ? SCI_ERRORS : SCIF_ERRORS)
 #define SCxSR_RDxF(port)\
@@ -274,16 +266,6 @@ static inline void sci_##name##_out(struct uart_port *port,\
 	}\
 }
 
-#if defiend(CONFIG_H8300)
-/* h8300 don't have SCIF */
-#define CPU_SCIF_FNS(name, scif_offset, scif_size)			\
-	static inline unsigned int sci_##name##_in(struct uart_port *port) {\
-		return 0;\
-	}\
-	static inline void sci_##name##_out(struct uart_port *port,\
-					unsigned int value) {\
-	}
-#else
 #define CPU_SCIF_FNS(name, scif_offset, scif_size)			\
 	static inline unsigned int sci_##name##_in(struct uart_port *port) {\
 		SCI_IN(scif_size, scif_offset);\
@@ -327,6 +309,13 @@ static inline void sci_##name##_out(struct uart_port *port,\
 				sh4_scif_offset, sh4_scif_size) \
 	CPU_SCIF_FNS(name, sh3_scif_offset, sh3_scif_size)
 #endif
+#elif defined(CONFIG_CPU_SH7723)
+		#define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size,\
+					sh4_scif_offset, sh4_scif_size) \
+			CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size,\
+					sh4_scif_offset, sh4_scif_size)
+		#define SCIF_FNS(name, sh4_scif_offset, sh4_scif_size) \
+			CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
 #elif defined(CONFIG_H8300) || defined(CONFIG_RX)
 #define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size,\
 				sh4_sci_offset, sh4_sci_size, \
@@ -334,16 +323,9 @@ static inline void sci_##name##_out(struct uart_port *port,\
 				sh4_scif_offset, sh4_scif_size, \
 				h8_sci_offset, h8_sci_size) \
 	CPU_SCI_FNS(name, h8_sci_offset, h8_sci_size)
-#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size,\
+#define SCIF_FNS(name, sh3_scif_offset, sh3_scif_size,			\
 					sh4_scif_offset, sh4_scif_size) \
 	CPU_SCIF_FNS(name, 0, 0)
-#elif defined(CONFIG_CPU_SH7723)
-		#define SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size,\
-					sh4_scif_offset, sh4_scif_size) \
-			CPU_SCIx_FNS(name, sh4_scifa_offset, sh4_scifa_size,\
-					sh4_scif_offset, sh4_scif_size)
-		#define SCIF_FNS(name, sh4_scif_offset, sh4_scif_size) \
-			CPU_SCIF_FNS(name, sh4_scif_offset, sh4_scif_size)
 #else
 #define SCIx_FNS(name, sh3_sci_offset, sh3_sci_size,\
 				sh4_sci_offset, sh4_sci_size, \
@@ -458,59 +440,7 @@ SCIF_FNS(DL,				0,  0, 0x0,  0) /* dummy */
 #define sci_in(port, reg) sci_##reg##_in(port)
 #define sci_out(port, reg, value) sci_##reg##_out(port, value)
 
-/* H8/300 series SCI pins assignment */
-#if defined(CONFIG_H8300)
-static const struct __attribute__((packed)) {
-	int port;             /* GPIO port no */
-	unsigned short rx, tx; /* GPIO bit no */
-} h8300_sci_pins[] = {
-#if defined(CONFIG_CPU_H83007) || defined(CONFIG_CPU_H83068)
-	{    /* SCI0 */
-		.port = H8300_GPIO_P9,
-		.rx   = H8300_GPIO_B2,
-		.tx   = H8300_GPIO_B0,
-	},
-	{    /* SCI1 */
-		.port = H8300_GPIO_P9,
-		.rx   = H8300_GPIO_B3,
-		.tx   = H8300_GPIO_B1,
-	},
-	{    /* SCI2 */
-		.port = H8300_GPIO_PB,
-		.rx   = H8300_GPIO_B7,
-		.tx   = H8300_GPIO_B6,
-	}
-#elif defined(CONFIG_H8S2678)
-	{    /* SCI0 */
-		.port = H8300_GPIO_P3,
-		.rx   = H8300_GPIO_B2,
-		.tx   = H8300_GPIO_B0,
-	},
-	{    /* SCI1 */
-		.port = H8300_GPIO_P3,
-		.rx   = H8300_GPIO_B3,
-		.tx   = H8300_GPIO_B1,
-	},
-	{    /* SCI2 */
-		.port = H8300_GPIO_P5,
-		.rx   = H8300_GPIO_B1,
-		.tx   = H8300_GPIO_B0,
-	}
-#endif
-};
-#endif
-
-#if defined(CONFIG_CPU_SH7706) || \
-	defined(CONFIG_CPU_SH7707) || \
-	defined(CONFIG_CPU_SH7708) || \
-	defined(CONFIG_CPU_SH7709)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-	if (port->mapbase == 0xfffffe80)
-		return __raw_readb(SCPDR)&0x01 ? 1 : 0; /* SCI */
-	return 1;
-}
-#elif defined(CONFIG_CPU_SH7750)  || \
+#if defined(CONFIG_CPU_SH7750)  || \
 	defined(CONFIG_CPU_SH7751)  || \
 	defined(CONFIG_CPU_SH7751R) || \
 	defined(CONFIG_CPU_SH7750R) || \
@@ -521,11 +451,6 @@ static inline int sci_rxd_in(struct uart_port *port)
 		return __raw_readb(SCSPTR1)&0x01 ? 1 : 0; /* SCI */
 	return 1;
 }
-#elif defined(CONFIG_H8300)
-static inline int sci_rxd_in(struct uart_port *port)
-{
-	return 1;
-}
 #else /* default case for non-SCI processors */
 static inline int sci_rxd_in(struct uart_port *port)
 {

--- a/include/configs/kanebebe.h
+++ b/include/configs/kanebebe.h
@@ -25,15 +25,10 @@
 #ifndef __KANEBEBE_H
 #define __KANEBEBE_H
 
-#define CONFIG_CPU_H83069	1
-#define CONFIG_H8300_RELOCATE	0
-
 /*#define CONFIG_SYS_LDSCRIPT "board/nisshin-tech/kanebebe/u-boot.lds.ram"*/
 
-#define CONFIG_BAUDRATE		38400
 #define CONFIG_BOOTARGS		"earlyprintk=sh-sci.1,38400 console=ttySC1,38400"
 #define CONFIG_BOARD_LATE_INIT
-#define CONFIG_SYS_TEXT_BASE 0x008000
 #define CONFIG_SYS_MONITOR_BASE 0x7b0000
 #define CONFIG_BOARD_EARLY_INIT_F
 #undef CONFIG_VERSION_VARIABLE
@@ -42,7 +37,6 @@
 /* MEMORY */
 #define KANEBEBE_DRAM_BASE	0x400000
 
-#define CONFIG_SYS_LONGHELP		/* undef to save memory	*/
 #define CONFIG_SYS_PROMPT	"=> "	/* Monitor Command Prompt */
 #define CONFIG_SYS_CBSIZE	256	/* Buffer size for input from the Console */
 #define CONFIG_SYS_PBSIZE	256	/* Buffer size for Console output */
@@ -52,17 +46,12 @@
 /* List of legal baudrate settings for this board */
 #define CONFIG_SYS_BAUDRATE_TABLE	{ 38400 }
 #define CONFIG_DOS_PARTITION
-#define CONFIG_OF_LIBFDT
 #define CONFIG_LMB
 
 /* SCI */
-#define CONFIG_SCI		1
 #define CONFIG_SCIF_CONSOLE	1
 #define CONFIG_CONS_SCIF1	1
 
-/* TIMER */
-#define CONFIG_TIMER_BASE	0xffff80	/* CH0-1 */
-
 #define CONFIG_SYS_MEMTEST_START	KANEBEBE_DRAM_BASE
 #define CONFIG_SYS_MEMTEST_END		(CONFIG_SYS_MEMTEST_START + (3 * 1024 * 1024))
 
@@ -86,19 +75,12 @@
 	
 #define CONFIG_SYS_RX_ETH_BUFFER	1
 
-#define CONFIG_SYS_NO_FLASH		1
 /*#define CONFIG_HAS_DATAFLASH		1*/
 
 /* Board Clock */
 #define CONFIG_SYS_CLK_FREQ		25000000
 #define CONFIG_SH_SCIF_CLK_FREQ		CONFIG_SYS_CLK_FREQ
 
-/* GPIO */
-#define CONFIG_H8300_GPIO \
-	{0x00,0x00,0x00,0x00,0xff,0x0f,0x87,0xff,0x00,0xff,0xef}
-#define CONFIG_H8300_INIT_DDR \
-	{0xff,0xff,0x00,0x00,0x01,0x00,0x00,0x0e,0x00,0xff,0x00}
-
 #ifdef CONFIG_NET
 #define CONFIG_DRIVER_NE2000		1
 #define CONFIG_DRIVER_NE2000_BASE	0x200000

--- a/include/image.h
+++ b/include/image.h
@@ -195,7 +195,7 @@ enum {
 	IH_ARCH_X86_64,			/* AMD x86_64, Intel and Via */
 	IH_ARCH_XTENSA,			/* Xtensa	*/
 	IH_ARCH_RISCV,			/* RISC-V */
-
+	IH_ARCH_H8300,			/* H8/300 */
 	IH_ARCH_COUNT,
 };