Skip to content
This repository was archived by the owner on Dec 13, 2021. It is now read-only.

Commit 46703f0

Browse files
ZigFisherZigFisher
authored
Merge pull request #48 from OpenIPC/develop
Develop
2 parents a6f1c50 + df7a473 commit 46703f0

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+1856
-145
lines changed

‎package/boot/uboot-hi35xx/files/include/configs/Todo.txt‎

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
2+
3+
ethernet boot_args
4+
-------- ---------
5+
hi3516c.h | testing done
6+
hi3516cv200.h | ok done
7+
hi3516cv300.h | ok done
8+
hi3516ev100.h | ok done
9+
hi3518a.h | done
10+
hi3518c.h | done
11+
hi3518e.h | testing done
12+
hi3518ev200.h | ok done
13+
hi3518ev201.h | done
14+
hi3520d.h | done
15+
|
16+
hi3518c_ussh.h | done
17+
hi3518ev200_rotek.h | done

‎package/boot/uboot-hi35xx/files/include/configs/hi3516c.h‎

Lines changed: 6 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@
149149
/*-----------------------------------------------------------------------
150150
* Environment Configuration
151151
------------------------------------------------------------------------*/
152-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
152+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
153153
#define CONFIG_BOOTDELAY 1
154-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
154+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
155155
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
156156
#define CONFIG_IPADDR 192.168.1.10 /* default static IP */
157157
#define CONFIG_SERVERIP 192.168.1.254 /* default tftp server ip */
@@ -199,23 +199,12 @@
199199
/* default is hieth-switch-fabric */
200200
#define CONFIG_NET_HISFV300
201201
#ifdef CONFIG_NET_HISFV300
202-
#define CONFIG_NET_HISFV300_3518 1 /* Add 2020.0821 */
203202
#define HISFV_MII_MODE 0
204203
#define HISFV_RMII_MODE 1
205-
#define HIETH_MII_RMII_MODE_U HISFV_MII_MODE
206-
#define HIETH_MII_RMII_MODE_D HISFV_MII_MODE
207-
#define HISFV_PHY_U 1 /* Change 2020.08.21 set 1 or 0 */
208-
#define HISFV_PHY_D 2 /* Change 2020.08.21 set 2 or 1 */
209-
#undef HISFV_RESET_GPIO_EN
210-
#ifdef HISFV_RESET_GPIO_EN
211-
/* use gpio5_0 to control sfv reset */
212-
#define HISFV_RESET_GPIO_BASE GPIO0_REG_BASE
213-
#define HISFV_RESET_GPIO_DIR 0x400
214-
#define HISFV_RESET_GPIO_BIT 5
215-
#define HISFV_RESET_GPIO_DIR_OUT 1
216-
/* 0-reset; 1-undo reset */
217-
#define HISFV_RESET_GPIO_DATA 0
218-
#endif /* HISFV_RESET_GPIO_EN */
204+
#define HIETH_MII_RMII_MODE_U HISFV_RMII_MODE
205+
#define HIETH_MII_RMII_MODE_D HISFV_RMII_MODE
206+
#define HISFV_PHY_U 1
207+
#define HISFV_PHY_D 2
219208
#endif /* CONFIG_NET_HISFV300 */
220209

221210
/*-----------------------------------------------------------------------

‎package/boot/uboot-hi35xx/files/include/configs/hi3516cv200.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
*-----------------------------------------------------------------------*/
144144
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
145145
#define CONFIG_BOOTDELAY 1
146-
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
146+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
147147
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
148148
#define CONFIG_IPADDR 192.168.1.10 /* static IP I currently own */
149149
#define CONFIG_SERVERIP 192.168.1.254 /* current IP of tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3516cv300.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -141,9 +141,9 @@
141141
/*-----------------------------------------------------------------------
142142
* Environment Configuration
143143
*-----------------------------------------------------------------------*/
144-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
144+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
145145
#define CONFIG_BOOTDELAY 1
146-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 panic=20 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
146+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=squashfs panic=20 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
147147
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
148148
#define CONFIG_IPADDR 192.168.1.10 /* static IP I currently own */
149149
#define CONFIG_SERVERIP 192.168.1.254 /* current IP of tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3516ev100.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,9 +143,9 @@
143143
/*-----------------------------------------------------------------------
144144
* Environment Configuration
145145
*-----------------------------------------------------------------------*/
146-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
146+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
147147
#define CONFIG_BOOTDELAY 1
148-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 panic=20 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
148+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 root=/dev/mtdblock3 rootfstype=squashfs panic=20 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
149149
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
150150
#define CONFIG_IPADDR 192.168.1.10 /* static IP I currently own */
151151
#define CONFIG_SERVERIP 192.168.1.254 /* current IP of tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3518a.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@
149149
/*-----------------------------------------------------------------------
150150
* Environment Configuration
151151
------------------------------------------------------------------------*/
152-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
152+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
153153
#define CONFIG_BOOTDELAY 1
154-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
154+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
155155
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
156156
#define CONFIG_IPADDR 192.168.1.10 /* default static IP */
157157
#define CONFIG_SERVERIP 192.168.1.254 /* default tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3518c.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -149,9 +149,9 @@
149149
/*-----------------------------------------------------------------------
150150
* Environment Configuration
151151
------------------------------------------------------------------------*/
152-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
152+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
153153
#define CONFIG_BOOTDELAY 1
154-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
154+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
155155
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
156156
#define CONFIG_IPADDR 192.168.1.10 /* default static IP */
157157
#define CONFIG_SERVERIP 192.168.1.254 /* default tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3518c_ussh.h‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@
128128
/*-----------------------------------------------------------------------
129129
* Environment Configuration
130130
------------------------------------------------------------------------*/
131-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
131+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
132132
#define CONFIG_BOOTDELAY 1
133-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
133+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
134134
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
135135
#define CONFIG_IPADDR 192.168.1.10 /* default static IP */
136136
#define CONFIG_SERVERIP 192.168.1.254 /* default tftp server ip */

‎package/boot/uboot-hi35xx/files/include/configs/hi3518e.h‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -128,9 +128,9 @@
128128
/*-----------------------------------------------------------------------
129129
* Environment Configuration
130130
------------------------------------------------------------------------*/
131-
#define CONFIG_BOOTCOMMAND "setenv bootargs $(bootargs) totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd); sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
131+
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
132132
#define CONFIG_BOOTDELAY 1
133-
#define CONFIG_BOOTARGS "console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
133+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
134134
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
135135
#define CONFIG_IPADDR 192.168.1.10 /* default static IP */
136136
#define CONFIG_SERVERIP 192.168.1.254 /* default tftp server ip */
@@ -174,16 +174,26 @@
174174

175175
/*-----------------------------------------------------------------------
176176
* HIETH driver
177+
#
178+
# Set CONFIG_HIETH_MII_RMII_MODE_U=1 - XM+Camhi+Blue vendor
179+
# Set CONFIG_HIETH_MII_RMII_MODE_D=1 - XM+Camhi+Blue vendor
180+
#
181+
# Set CONFIG_HIETH_PHYID_U=1 - XM vendor
182+
# Set CONFIG_HIETH_PHYID_D=2 - XM vendor
183+
#
184+
# Set CONFIG_HIETH_PHYID_U=0 - Camhi/Blue vendor
185+
# Set CONFIG_HIETH_PHYID_D=1 - Camhi/Blue vendor
186+
#
177187
-----------------------------------------------------------------------*/
178188
/* default is hieth-switch-fabric */
179189
#define CONFIG_NET_HISFV300
180190
#ifdef CONFIG_NET_HISFV300
181191
#define HISFV_MII_MODE 0
182192
#define HISFV_RMII_MODE 1
183-
#define HIETH_MII_RMII_MODE_U HISFV_MII_MODE
184-
#define HIETH_MII_RMII_MODE_D HISFV_MII_MODE
185-
#define HISFV_PHY_U 1
186-
#define HISFV_PHY_D 2 /* fix me */
193+
#define HIETH_MII_RMII_MODE_U HISFV_RMII_MODE
194+
#define HIETH_MII_RMII_MODE_D HISFV_RMII_MODE
195+
#define HISFV_PHY_U 0
196+
#define HISFV_PHY_D 1 /* fix me */
187197
#endif /* CONFIG_NET_HISFV300 */
188198

189199
/*-----------------------------------------------------------------------

‎package/boot/uboot-hi35xx/files/include/configs/hi3518ev200.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
*-----------------------------------------------------------------------*/
144144
#define CONFIG_BOOTCOMMAND "setenv setargs setenv bootargs ${bootargs}; run setargs; sf probe 0; sf read 0x82000000 0x50000 0x200000; bootm 0x82000000"
145145
#define CONFIG_BOOTDELAY 1
146-
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs,jffs2 mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
146+
#define CONFIG_BOOTARGS "totalmem=$(totalmem) mem=$(osmem) ethaddr=$(ethaddr) phyaddru=$(phyaddru) phyaddrd=$(phyaddrd) sensor=$(sensor) linux_cmd=$(linux_cmd) console=ttyAMA0,115200 panic=20 root=/dev/mtdblock3 rootfstype=squashfs mtdparts=hi_sfc:256k(boot),64k(env),2048k(kernel),5120k(rootfs),-(rootfs_data)"
147147
#define CONFIG_NETMASK 255.255.255.0 /* talk on MY local net */
148148
#define CONFIG_IPADDR 192.168.1.10 /* static IP I currently own */
149149
#define CONFIG_SERVERIP 192.168.1.254 /* current IP of tftp server ip */

0 commit comments

Comments
 (0)