tacit/minix
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge 68a04fa44b into a7a79fa1f5

Browse Source
This commit is contained in:
rlfnb 2016-06-18 15:43:17 +00:00 committed by GitHub
commit e35ccccaae
3 changed files with 19 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
minix/drivers/net/rtl8169/rtl8169.c
View File

@ -752,6 +752,9 @@ static void rl_reset_hw(re_t *rep)
case RL_TCR_HWVER_RTL8105E: case RL_TCR_HWVER_RTL8105E:
rep->re_model = "RTL8105E"; rep->re_model = "RTL8105E";
break; break;
case RL_TCR_HWVER_RTL8111GS_CG:
rep->re_model = "RTL8111GS-GC";
break;
default: default:
rep->re_model = "Unknown"; rep->re_model = "Unknown";
rep->re_mac = t; rep->re_mac = t;

1
minix/drivers/net/rtl8169/rtl8169.h
View File

@ -112,6 +112,7 @@
#define RL_TCR_HWVER_RTL8169 0x00000000 /* RTL8169 */ #define RL_TCR_HWVER_RTL8169 0x00000000 /* RTL8169 */
#define RL_TCR_HWVER_RTL8169S 0x00800000 /* RTL8169S */ #define RL_TCR_HWVER_RTL8169S 0x00800000 /* RTL8169S */
#define RL_TCR_HWVER_RTL8110S 0x04000000 /* RTL8110S */ #define RL_TCR_HWVER_RTL8110S 0x04000000 /* RTL8110S */
#define RL_TCR_HWVER_RTL8111GS_CG 0x4C000000 /* RTL8111GS-CG */
#define RL_TCR_HWVER_RTL8169SB 0x10000000 /* RTL8169sb/8110sb */ #define RL_TCR_HWVER_RTL8169SB 0x10000000 /* RTL8169sb/8110sb */
#define RL_TCR_HWVER_RTL8110SCd 0x18000000 /* RTL8169sc/8110sc */ #define RL_TCR_HWVER_RTL8110SCd 0x18000000 /* RTL8169sc/8110sc */
#define RL_TCR_HWVER_RTL8105E 0x40800000 /* RTL8105E */ #define RL_TCR_HWVER_RTL8105E 0x40800000 /* RTL8105E */

16
releasetools/x86_hdimage.sh
View File

@ -26,6 +26,7 @@ fi
: ${ROOT_SIZE=$(( 128*(2**20) - ${BOOTXX_SECS} * 512 ))} : ${ROOT_SIZE=$(( 128*(2**20) - ${BOOTXX_SECS} * 512 ))}
: ${HOME_SIZE=$(( 128*(2**20) ))} : ${HOME_SIZE=$(( 128*(2**20) ))}
: ${USR_SIZE=$(( 1792*(2**20) ))} : ${USR_SIZE=$(( 1792*(2**20) ))}
: ${EFI_SIZE=$(( 0 ))}
# set up disk creation environment # set up disk creation environment
. releasetools/image.defaults . releasetools/image.defaults
@ -93,14 +94,23 @@ echo " * HOME"
_HOME_SIZE=$(${CROSS_TOOLS}/nbmkfs.mfs -d ${HOMESIZEARG} -I $((${HOME_START}*512)) ${IMG} ${WORK_DIR}/proto.home) _HOME_SIZE=$(${CROSS_TOOLS}/nbmkfs.mfs -d ${HOMESIZEARG} -I $((${HOME_START}*512)) ${IMG} ${WORK_DIR}/proto.home)
_HOME_SIZE=$(($_HOME_SIZE / 512)) _HOME_SIZE=$(($_HOME_SIZE / 512))
# if [ ${EFI_SIZE} -ge 512 ]
then
echo " * EFI"
dd if=/dev/zero bs=${EFI_SIZE} count=1 >> ${IMG}
# Write the partition table using the natively compiled # Write the partition table using the natively compiled
# minix partition utility # minix partition utility
# ${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE}* 81:${_USR_SIZE} 81:${_HOME_SIZE} EF:1+
${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE} 81:${_USR_SIZE} 81:${_HOME_SIZE} else
# Write the partition table using the natively compiled
# minix partition utility
${CROSS_TOOLS}/nbpartition -m ${IMG} ${BOOTXX_SECS} 81:${_ROOT_SIZE}* 81:${_USR_SIZE} 81:${_HOME_SIZE}
fi
${CROSS_TOOLS}/nbinstallboot -f -m ${ARCH} ${IMG} ${DESTDIR}/usr/mdec/bootxx_minixfs3 ${CROSS_TOOLS}/nbinstallboot -f -m ${ARCH} ${IMG} ${DESTDIR}/usr/mdec/bootxx_minixfs3
echo "" echo ""
mods="`( cd ${MODDIR}; echo mod* | tr ' ' ',' )`"
echo "Disk image at `pwd`/${IMG}" echo "Disk image at `pwd`/${IMG}"
echo "" echo ""
echo "To boot this image on kvm using the bootloader:" echo "To boot this image on kvm using the bootloader:"