GENIETV patch by Paolo Scaffardi (Fri, 5 Jan 2001 11:27:44 +0100)

diff --git a/CHANGELOG b/CHANGELOG
index dcde655d07df6155bc6f6794656236f4096a5189..69dc839386c45f7e16e2bef6f93e5db8ca6cedf8 100644 (file)
--- a/CHANGELOG
+++ b/CHANGELOG
@@ -61,6 +61,14 @@ To do:
 Modifications since 0.7.1:
 ======================================================================
 
+----------------------------------------------------------------------
+GENIETV patch by Paolo Scaffardi (Fri, 5 Jan 2001 11:27:44 +0100):
+* Added support for AMDLV040B 512Kb flash into flash.h
+* Changed TEXTBASE into GENIETV configuration
+* Added VIDEO_ADDR definition into config_GENIETV.h
+* Removed unused files: wl_4ppm_keyboard.c and wl_4ppm_keyboard.h
+----------------------------------------------------------------------
+
 * Fix in cpu/mpc8xx/fec.c (by Dave Ellis): The PHY discovery code
   must be called after the FEC is enabled, since it uses the FEC to
   talk to the PHY.

diff --git a/board/genietv/config.mk b/board/genietv/config.mk
index 47ea7af41544e46818808b938f1a85c80fb1b838..69ab21fcf0804e90718528653600a4c8b822c3d3 100644 (file)
--- a/board/genietv/config.mk
+++ b/board/genietv/config.mk
@@ -21,5 +21,5 @@
 # MA 02111-1307 USA
 #
 
-TEXT_BASE = 0x02800000
-OBJCFLAGS =    --set-section-flags=.ppcenv=contents,alloc,load,data
+TEXT_BASE = 0x00000000
+OBJCFLAGS = --set-section-flags=.ppcenv=contents,alloc,load,data

diff --git a/cpu/mpc8xx/wl_4ppm_keyboard.c b/cpu/mpc8xx/wl_4ppm_keyboard.c
deleted file mode 100644 (file)
index fb2e81a..0000000
--- a/cpu/mpc8xx/wl_4ppm_keyboard.c
+++ /dev/null
@@ -1,21 +0,0 @@
-/*
-** Wireless 56Khz 4PPM keyboard interface on SMCx
-** ==============================================
-** (C) 2000 by Paolo Scaffardi (arsenio@tin.it)
-** AIRVENT SAM s.p.a - RIMINI(ITALY)
-**
-** Not currently supported. Still under construction.
-*/
-#include <ppcboot.h>
-#include <config.h>
-#include <wl_4ppm_keyboard.h>
-
-int    wl_4ppm_keyboard_getc(void)
-{
-    return serial_getc();
-}
-
-int    wl_4ppm_keyboard_tstc(void)
-{
-    return serial_tstc();
-}

diff --git a/include/config_GENIETV.h b/include/config_GENIETV.h
index 621ce4fd24ec2acd2b6c891741bb7b8b0e62ace3..50357d18471cb227193b9b5cbd3328cf93556552 100644 (file)
--- a/include/config_GENIETV.h
+++ b/include/config_GENIETV.h
@@ -42,6 +42,7 @@
 #define CONFIG_ENV_OVERWRITE                   1       // Overwrite the environment
 
 #define CONFIG_VIDEO           1       // To enable the video initialization
+#define CONFIG_VIDEO_ADDR      0x00200000
 #define CONFIG_I2C             1       // Needed for 7176 & 7177
 #define CONFIG_PCMCIA          1       // To enable the PCMCIA initialization
 

diff --git a/include/flash.h b/include/flash.h
index cc88e5cd99074ceb19fcf3e14fd042c6837e7b69..560d9207be269d1ab0b7bf15c6059d413d48e4a6 100644 (file)
--- a/include/flash.h
+++ b/include/flash.h
@@ -58,6 +58,8 @@ void flash_sect_protect       (int flag, ulong addr_first, ulong addr_last);
 
 #define        INTL_ID_28F016S 0x66a066a0      /* 28F016S[VS] ID (16M = 512k x 16)     */
 
+#define AMD_ID_LV040B  0x4F            /* 29LV040B ID  (512Kb, bottom boot sector) */
+
 #define AMD_ID_F040B   0xA4            /* 29F040B ID  ( 4 M, bottom boot sect) */
 #define AMD_ID_F080B   0xD5            /* 29F0B0  ID  ( 1 M)                   */
 

diff --git a/include/wl_4ppm_keyboard.h b/include/wl_4ppm_keyboard.h
deleted file mode 100644 (file)
index 5a15616..0000000
--- a/include/wl_4ppm_keyboard.h
+++ /dev/null
@@ -1,16 +0,0 @@
-/*
-** Wireless 56Khz 4PPM keyboard interface on SMCx
-** ==============================================
-** (C) 2000 by Paolo Scaffardi (arsenio@tin.it)
-** AIRVENT SAM s.p.a - RIMINI(ITALY)
-**
-** Not currently supported. Still under construction.
-*/
-
-#ifndef _WL_4PPM_KEYBOARD_
-#define _WL_4PPM_KEYBOARD_
-
-int    wl_4ppm_keyboard_getc(void);
-int    wl_4ppm_keyboard_tstc(void);
-
-#endif